From d7d6b9c10f57552ec32f6673fe6b83ab60e2f38b Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Wed, 28 Apr 2021 11:04:32 +0200
Subject: [PATCH] Update visitor
---
source/RobotAPI/libraries/armem/CMakeLists.txt | 4 ++--
.../libraries/armem/core/{ => workingmemory}/Visitor.cpp | 4 ++--
.../libraries/armem/core/{ => workingmemory}/Visitor.h | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
rename source/RobotAPI/libraries/armem/core/{ => workingmemory}/Visitor.cpp (96%)
rename source/RobotAPI/libraries/armem/core/{ => workingmemory}/Visitor.h (99%)
diff --git a/source/RobotAPI/libraries/armem/CMakeLists.txt b/source/RobotAPI/libraries/armem/CMakeLists.txt
index 13db1d957..0e3d33e19 100644
--- a/source/RobotAPI/libraries/armem/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem/CMakeLists.txt
@@ -18,7 +18,6 @@ set(LIB_FILES
core/Time.cpp
core/ice_conversions.cpp
core/aron_conversions.cpp
- core/Visitor.cpp
core/base/detail/MemoryItem.cpp
core/base/detail/MaxHistorySize.cpp
@@ -43,6 +42,7 @@ set(LIB_FILES
core/workingmemory/EntitySnapshot.cpp
core/workingmemory/Memory.cpp
core/workingmemory/ProviderSegment.cpp
+ core/workingmemory/Visitor.cpp
core/workingmemory/ice_conversions.cpp
core/longtermmemory/CoreSegment.cpp
@@ -137,6 +137,7 @@ set(LIB_HEADERS
core/workingmemory/EntitySnapshot.h
core/workingmemory/Memory.h
core/workingmemory/ProviderSegment.h
+ core/workingmemory/Visitor.h
core/workingmemory/ice_conversions.h
core/longtermmemory/CoreSegment.h
@@ -157,7 +158,6 @@ set(LIB_HEADERS
core/ice_conversions_templates.h
core/ice_conversions.h
- core/Visitor.h
client.h
client/ComponentPlugin.h
diff --git a/source/RobotAPI/libraries/armem/core/Visitor.cpp b/source/RobotAPI/libraries/armem/core/workingmemory/Visitor.cpp
similarity index 96%
rename from source/RobotAPI/libraries/armem/core/Visitor.cpp
rename to source/RobotAPI/libraries/armem/core/workingmemory/Visitor.cpp
index 8e6417391..986612d1e 100644
--- a/source/RobotAPI/libraries/armem/core/Visitor.cpp
+++ b/source/RobotAPI/libraries/armem/core/workingmemory/Visitor.cpp
@@ -2,11 +2,11 @@
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
-#include <RobotAPI/libraries/armem/core/Memory.h>
+#include <RobotAPI/libraries/armem/core/workingmemory/Memory.h>
#include <RobotAPI/libraries/armem/core/error.h>
-namespace armarx::armem
+namespace armarx::armem::wm
{
Visitor::Visitor()
diff --git a/source/RobotAPI/libraries/armem/core/Visitor.h b/source/RobotAPI/libraries/armem/core/workingmemory/Visitor.h
similarity index 99%
rename from source/RobotAPI/libraries/armem/core/Visitor.h
rename to source/RobotAPI/libraries/armem/core/workingmemory/Visitor.h
index e9ec9629d..c0a3854a2 100644
--- a/source/RobotAPI/libraries/armem/core/Visitor.h
+++ b/source/RobotAPI/libraries/armem/core/workingmemory/Visitor.h
@@ -1,6 +1,7 @@
#pragma once
-namespace armarx::armem
+
+namespace armarx::armem::wm
{
class Memory;
class CoreSegment;
--
GitLab