From 18d8e56d27db8bb053ec07a52c29c0bbf361aaca Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Mon, 10 May 2021 08:24:06 +0200
Subject: [PATCH] armem/client: Reader and writer methods useMemory() are now
public
---
source/RobotAPI/libraries/armem/client/ComponentPlugin.h | 7 ++++---
.../libraries/armem/client/ReaderComponentPlugin.h | 5 ++---
.../libraries/armem/client/WriterComponentPlugin.h | 7 ++-----
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/client/ComponentPlugin.h b/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
index e35f9e08d..7fc432536 100644
--- a/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
@@ -27,9 +27,6 @@ namespace armarx::armem::client
ComponentPluginUser();
~ComponentPluginUser() override;
- protected:
-
- void setMemory(server::MemoryInterfacePrx memory);
/**
* @brief Resolve the given memory name, add it as dependency and update the readers and writers.
@@ -40,6 +37,10 @@ namespace armarx::armem::client
virtual armem::data::WaitForMemoryResult useMemory(const std::string& memoryName) override;
using mns::plugins::ClientPluginUserBase::useMemory;
+ protected:
+
+ void setMemory(server::MemoryInterfacePrx memory);
+
};
}
diff --git a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
index 44f276ac9..8c7858bfc 100644
--- a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
@@ -50,16 +50,15 @@ namespace armarx::armem::client
ReaderComponentPluginUser();
~ReaderComponentPluginUser() override;
+ virtual armem::data::WaitForMemoryResult useMemory(const std::string& memoryName) override;
+ using mns::plugins::ClientPluginUserBase::useMemory;
virtual void memoryUpdated(const std::vector<data::MemoryID>& updatedSnapshotIDs, const Ice::Current& current) override;
-
protected:
void setReadingMemory(server::ReadingMemoryInterfacePrx memory);
- virtual armem::data::WaitForMemoryResult useMemory(const std::string& memoryName) override;
- using mns::plugins::ClientPluginUserBase::useMemory;
protected:
diff --git a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
index 6df32feea..0f5f21f80 100644
--- a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
@@ -40,16 +40,13 @@ namespace armarx::armem::client
WriterComponentPluginUser();
~WriterComponentPluginUser() override;
- protected:
-
- void setWritingMemory(server::WritingMemoryInterfacePrx memory);
-
virtual armem::data::WaitForMemoryResult useMemory(const std::string& memoryName) override;
using mns::plugins::ClientPluginUserBase::useMemory;
-
protected:
+ void setWritingMemory(server::WritingMemoryInterfacePrx memory);
+
Writer memoryWriter;
private:
--
GitLab