Skip to content
Snippets Groups Projects
Commit b61c938a authored by Fabian Reister's avatar Fabian Reister
Browse files

cleanup

parent affc2c8e
No related branches found
No related tags found
No related merge requests found
...@@ -137,6 +137,7 @@ set(LIB_HEADERS ...@@ -137,6 +137,7 @@ set(LIB_HEADERS
client/plugins/ListeningPlugin.h client/plugins/ListeningPlugin.h
client/plugins/PluginUser.h client/plugins/PluginUser.h
client/plugins/Plugin.h client/plugins/Plugin.h
client/plugins/ReaderWriterPlugin.h
client/query.h client/query.h
client/Query.h client/Query.h
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
#include <string> #include <string>
#include "ArmarXCore/core/exceptions/local/ExpressionException.h" #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <ArmarXCore/core/ComponentPlugin.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/interface/armem/mns/MemoryNameSystemInterface.h>
#include <RobotAPI/libraries/armem/client/MemoryNameSystem.h> #include <RobotAPI/libraries/armem/client/MemoryNameSystem.h>
...@@ -48,8 +48,7 @@ namespace armarx::armem::client::plugins ...@@ -48,8 +48,7 @@ namespace armarx::armem::client::plugins
ReaderWriterPlugin(ManagedIceObject& parent, const std::string pre) : ReaderWriterPlugin(ManagedIceObject& parent, const std::string pre) :
ComponentPlugin(parent, pre), readerWriter(memoryNameSystem()) ComponentPlugin(parent, pre), readerWriter(memoryNameSystem())
{ {
addPlugin(armemPlugin); addPlugin(armemPlugin);
} }
~ReaderWriterPlugin() override = default; ~ReaderWriterPlugin() override = default;
...@@ -97,7 +96,6 @@ namespace armarx::armem::client::plugins ...@@ -97,7 +96,6 @@ namespace armarx::armem::client::plugins
return readerWriter; return readerWriter;
} }
private: private:
MemoryNameSystem& MemoryNameSystem&
memoryNameSystem() memoryNameSystem()
...@@ -111,9 +109,10 @@ namespace armarx::armem::client::plugins ...@@ -111,9 +109,10 @@ namespace armarx::armem::client::plugins
return armemPlugin->getMemoryNameSystemClient(); return armemPlugin->getMemoryNameSystemClient();
} }
armarx::armem::client::plugins::Plugin* armemPlugin = nullptr;
T readerWriter; T readerWriter;
armarx::armem::client::plugins::Plugin* armemPlugin = nullptr;
}; };
} // namespace armarx::armem::client::plugins } // namespace armarx::armem::client::plugins
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment