From 75fc6610b30ac898b0e366de59914da96d55520f Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Tue, 17 Aug 2021 18:12:13 +0200
Subject: [PATCH] Update to changes in armem
---
.../components/NavigationMemory/NavigationMemory.cpp | 3 +--
.../libraries/memory/client/parameterization/Writer.cpp | 7 +++++--
.../libraries/memory/client/parameterization/Writer.h | 9 +++++----
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/source/Navigation/components/NavigationMemory/NavigationMemory.cpp b/source/Navigation/components/NavigationMemory/NavigationMemory.cpp
index e3b6f0b7..7b4bb34f 100644
--- a/source/Navigation/components/NavigationMemory/NavigationMemory.cpp
+++ b/source/Navigation/components/NavigationMemory/NavigationMemory.cpp
@@ -73,8 +73,7 @@ namespace armarx
// (Requies the armarx::DebugObserverComponentPluginUser.)
// setDebugObserverBatchModeEnabled(true);
- workingMemory.name() = p.memoryName;
- longtermMemory.name() = p.memoryName;
+ setMemoryName(p.memoryName);
workingMemory.addCoreSegment("Parameterization");
diff --git a/source/Navigation/libraries/memory/client/parameterization/Writer.cpp b/source/Navigation/libraries/memory/client/parameterization/Writer.cpp
index 19053f78..dc6a0348 100644
--- a/source/Navigation/libraries/memory/client/parameterization/Writer.cpp
+++ b/source/Navigation/libraries/memory/client/parameterization/Writer.cpp
@@ -1,12 +1,15 @@
#include "Writer.h"
-#include "Navigation/libraries/core/constants.h"
+#include <Navigation/libraries/core/constants.h>
+
+#include <RobotAPI/libraries/aron/core/navigator/data/AllNavigators.h>
+
namespace armarx::nav::mem::client::param
{
bool
Writer::store(const std::unordered_map<core::StackLayer,
- aron::datanavigator::DictNavigator::PointerType>& stack,
+ aron::datanavigator::DictNavigatorPtr>& stack,
const std::string& clientID,
const core::TimestampUs& timestamp)
{
diff --git a/source/Navigation/libraries/memory/client/parameterization/Writer.h b/source/Navigation/libraries/memory/client/parameterization/Writer.h
index ca69dab0..b98b7daf 100644
--- a/source/Navigation/libraries/memory/client/parameterization/Writer.h
+++ b/source/Navigation/libraries/memory/client/parameterization/Writer.h
@@ -21,10 +21,11 @@
#pragma once
-#include "RobotAPI/libraries/armem/client/util/SimpleWriterBase.h"
+#include <RobotAPI/libraries/aron/core/navigator/data/forward_declarations.h>
+#include <RobotAPI/libraries/armem/client/util/SimpleWriterBase.h>
-#include "Navigation/libraries/core/constants.h"
-#include "Navigation/libraries/core/types.h"
+#include <Navigation/libraries/core/constants.h>
+#include <Navigation/libraries/core/types.h>
namespace armarx::nav::mem::client::param
@@ -37,7 +38,7 @@ namespace armarx::nav::mem::client::param
bool store(const std::unordered_map<core::StackLayer,
- aron::datanavigator::DictNavigator::PointerType>& stack,
+ aron::datanavigator::DictNavigatorPtr>& stack,
const std::string& clientID,
const core::TimestampUs& timestamp);
--
GitLab