From af0341c341719d5cf0498cd434bc891794c85b18 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 16 Jul 2021 09:06:26 +0200
Subject: [PATCH] Update include to ComponentPlugin.h
---
.../libraries/armem/server/ComponentPlugin.cpp | 11 +++++++----
.../RobotAPI/libraries/armem/server/ComponentPlugin.h | 6 ++++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp b/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
index 7b3a1d058..aa3962570 100644
--- a/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
@@ -1,5 +1,6 @@
#include "ComponentPlugin.h"
+#include <ArmarXCore/core/Component.h>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <RobotAPI/libraries/armem/core/error.h>
@@ -11,8 +12,7 @@
namespace armarx::armem::server::plugins
{
- ComponentPlugin::~ComponentPlugin()
- {}
+ ComponentPlugin::~ComponentPlugin() = default;
void ComponentPlugin::postCreatePropertyDefinitions(PropertyDefinitionsPtr& properties)
@@ -118,6 +118,8 @@ namespace armarx::armem::server
addPlugin(plugin);
}
+ ComponentPluginUser::~ComponentPluginUser() = default;
+
// WRITING
data::AddSegmentsResult ComponentPluginUser::addSegments(const data::AddSegmentsInput& input, const Ice::Current&)
@@ -148,7 +150,8 @@ namespace armarx::armem::server
return iceMemory.query(input);
}
- // LTM LOADING
+
+ // LTM STORING
data::StoreResult ComponentPluginUser::store(const data::StoreInput& input, const Ice::Current&)
{
std::scoped_lock lock(workingMemoryMutex, longtermMemoryMutex);
@@ -156,7 +159,7 @@ namespace armarx::armem::server
}
- // LTM STORING
+ // LTM LOADING
armem::query::data::Result ComponentPluginUser::load(const armem::query::data::Input& input, const Ice::Current&)
{
std::scoped_lock lock(longtermMemoryMutex);
diff --git a/source/RobotAPI/libraries/armem/server/ComponentPlugin.h b/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
index 5f9ef1d57..c03668ea8 100644
--- a/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
@@ -2,7 +2,7 @@
#include <mutex>
-#include <ArmarXCore/core/Component.h>
+#include <ArmarXCore/core/ComponentPlugin.h>
#include <RobotAPI/interface/armem/server/MemoryInterface.h>
#include <RobotAPI/interface/armem/client/MemoryListenerInterface.h>
@@ -73,7 +73,7 @@ namespace armarx::armem::server
public:
ComponentPluginUser();
- virtual ~ComponentPluginUser() override = default;
+ virtual ~ComponentPluginUser() override;
// WritingInterface interface
@@ -96,6 +96,7 @@ namespace armarx::armem::server
public:
+
/// The actual memory.
wm::Memory workingMemory;
std::mutex workingMemoryMutex;
@@ -112,6 +113,7 @@ namespace armarx::armem::server
private:
+
plugins::ComponentPlugin* plugin = nullptr;
};
--
GitLab