From b61c938abeb494447d0ee7046bb23fa595414172 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Tue, 7 Jun 2022 16:26:13 +0200
Subject: [PATCH] cleanup
---
source/RobotAPI/libraries/armem/CMakeLists.txt | 1 +
.../armem/client/plugins/ReaderWriterPlugin.h | 11 +++++------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/CMakeLists.txt b/source/RobotAPI/libraries/armem/CMakeLists.txt
index 62da88404..a75412cac 100644
--- a/source/RobotAPI/libraries/armem/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem/CMakeLists.txt
@@ -137,6 +137,7 @@ set(LIB_HEADERS
client/plugins/ListeningPlugin.h
client/plugins/PluginUser.h
client/plugins/Plugin.h
+ client/plugins/ReaderWriterPlugin.h
client/query.h
client/Query.h
diff --git a/source/RobotAPI/libraries/armem/client/plugins/ReaderWriterPlugin.h b/source/RobotAPI/libraries/armem/client/plugins/ReaderWriterPlugin.h
index dd35fb6dc..76936faeb 100644
--- a/source/RobotAPI/libraries/armem/client/plugins/ReaderWriterPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/plugins/ReaderWriterPlugin.h
@@ -23,10 +23,10 @@
#include <string>
-#include "ArmarXCore/core/exceptions/local/ExpressionException.h"
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <ArmarXCore/core/ComponentPlugin.h>
-#include "RobotAPI/libraries/armem/client/plugins/Plugin.h"
+#include <RobotAPI/libraries/armem/client/plugins/Plugin.h>
#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
#include <RobotAPI/libraries/armem/client/MemoryNameSystem.h>
@@ -48,8 +48,7 @@ namespace armarx::armem::client::plugins
ReaderWriterPlugin(ManagedIceObject& parent, const std::string pre) :
ComponentPlugin(parent, pre), readerWriter(memoryNameSystem())
{
- addPlugin(armemPlugin);
-
+ addPlugin(armemPlugin);
}
~ReaderWriterPlugin() override = default;
@@ -97,7 +96,6 @@ namespace armarx::armem::client::plugins
return readerWriter;
}
-
private:
MemoryNameSystem&
memoryNameSystem()
@@ -111,9 +109,10 @@ namespace armarx::armem::client::plugins
return armemPlugin->getMemoryNameSystemClient();
}
+ armarx::armem::client::plugins::Plugin* armemPlugin = nullptr;
+
T readerWriter;
- armarx::armem::client::plugins::Plugin* armemPlugin = nullptr;
};
} // namespace armarx::armem::client::plugins
--
GitLab