diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
index 1457fc466ae12031d22482703c0037787c6d0a62..e94cfbc11f465d6d7e2c8335f8b8a43135d15bf3 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
@@ -19,7 +19,7 @@ namespace fs = ::std::filesystem;
namespace armarx::armem::articulated_object
{
- Reader::Reader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ Reader::Reader(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem)
{}
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.h b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.h
index b4c908a3629e7dbecaddeb668dd95442be33a310..d7a0d3c75b45546760b8be8be5b1749c7e35fbf0 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.h
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.h
@@ -38,7 +38,7 @@ namespace armarx::armem::articulated_object
virtual public ReaderInterface
{
public:
- Reader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ Reader(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~Reader() = default;
void registerPropertyDefinitions(armarx::PropertyDefinitionsPtr& def);
@@ -75,7 +75,7 @@ namespace armarx::armem::articulated_object
const std::string propertyPrefix = "mem.obj.articulated.";
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Reader memoryReader;
std::mutex memoryWriterMutex;
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp
index d74c8d86593df0f7d5a3ee5617403a1ccd1cc769..04dc6d4bf485063b25bc8cb5cf077b53630c1739 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp
@@ -20,7 +20,7 @@
namespace armarx::armem::articulated_object
{
- Writer::Writer(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ Writer::Writer(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem)
{}
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h
index d9ce15069e8fe2e23f8f841a38323d66e0080d19..62629b674cdbc0b860d2f158886d747fde79fd36 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h
@@ -39,7 +39,7 @@ namespace armarx::armem::articulated_object
virtual public WriterInterface
{
public:
- Writer(const armem::client::MemoryNameSystem& memoryNameSystem);
+ Writer(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~Writer() = default;
@@ -79,7 +79,7 @@ namespace armarx::armem::articulated_object
const std::string propertyPrefix = "mem.obj.articulated.";
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Writer memoryWriter;
std::mutex memoryWriterMutex;
diff --git a/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.cpp b/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.cpp
index 64d8003fb7fe06dd8bd819f71bcbfc97357f6929..f723f30b2eb2d704dcfae73f47e9351cf659b7ad 100644
--- a/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.cpp
@@ -74,7 +74,7 @@ namespace armarx::armem::attachment
}
} // namespace
- Reader::Reader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ Reader::Reader(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem)
{}
diff --git a/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.h b/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.h
index 9149cbd5a52aedc03cea2a1af8482883637960cb..1080156c8bbbdb95afc62c0467d53dbe700c49f9 100644
--- a/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.h
+++ b/source/RobotAPI/libraries/armem_objects/client/attachment/Reader.h
@@ -36,7 +36,7 @@ namespace armarx::armem::attachment
class Reader
{
public:
- Reader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ Reader(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~Reader() = default;
void registerPropertyDefinitions(armarx::PropertyDefinitionsPtr& def);
@@ -59,7 +59,7 @@ namespace armarx::armem::attachment
const std::string propertyPrefix = "mem.obj.attachment.";
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Reader memoryReader;
std::mutex memoryWriterMutex;
};
diff --git a/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.cpp b/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.cpp
index dc520d22601308fd780a09448f69c2a82d8f1948..69f5806c2bb6dc4cbfae1f196d4f967c04ab9a12 100644
--- a/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.cpp
@@ -19,7 +19,7 @@
namespace armarx::armem::attachment
{
- Writer::Writer(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ Writer::Writer(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem)
{}
diff --git a/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.h b/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.h
index df85beca85be4523f2010a9c0b743517aae297a4..754f4f28041429cd1bb93c9bd3b962335c984530 100644
--- a/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.h
+++ b/source/RobotAPI/libraries/armem_objects/client/attachment/Writer.h
@@ -38,7 +38,7 @@ namespace armarx::armem::attachment
class Writer
{
public:
- Writer(const armem::client::MemoryNameSystem& memoryNameSystem);
+ Writer(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~Writer() = default;
@@ -61,7 +61,7 @@ namespace armarx::armem::attachment
const std::string propertyPrefix = "mem.obj.articulated.";
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Writer memoryWriter;
std::mutex memoryWriterMutex;
diff --git a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
index a2394a26a15e6059005b30f634e3cbdbb9e83cf2..b9caa0773f870d58f84e4d4255122c10b4b2a9d8 100644
--- a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
@@ -53,7 +53,7 @@
namespace armarx::armem
{
- MappingDataReader::MappingDataReader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ MappingDataReader::MappingDataReader(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem)
{
}
diff --git a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.h b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.h
index 39332417b0ff92fa7aa6149209d768c549bc03fc..2479b9413aebe634257eadb2cf00f0765f4ba20c 100644
--- a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.h
+++ b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.h
@@ -64,7 +64,7 @@ namespace armarx::armem
{
public:
- MappingDataReader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ MappingDataReader(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~MappingDataReader();
void connect();
@@ -108,7 +108,7 @@ namespace armarx::armem
private:
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Reader memoryReader;
// Properties
diff --git a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.cpp b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.cpp
index 82a365295236041f9bc457eaf34acc237f81ce18..fcf303e7bdfeb2bc35ce415da34e315671bb5ec9 100644
--- a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.cpp
+++ b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.cpp
@@ -8,7 +8,7 @@
namespace armarx::armem
{
- MappingDataWriter::MappingDataWriter(const armem::client::MemoryNameSystem& memoryNameSystem)
+ MappingDataWriter::MappingDataWriter(armem::client::MemoryNameSystem& memoryNameSystem)
: memoryNameSystem(memoryNameSystem) {}
MappingDataWriter::~MappingDataWriter() = default;
diff --git a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.h b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.h
index c7d8ba57719bf7d6004040d6487aa5cc32c5a621..ab4187ada2cf1476f1841c869112e5cce1b3d78c 100644
--- a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.h
+++ b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.h
@@ -50,7 +50,7 @@ namespace armarx::armem
{
public:
- MappingDataWriter(const armem::client::MemoryNameSystem& memoryNameSystem);
+ MappingDataWriter(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~MappingDataWriter();
void connect();
@@ -65,7 +65,7 @@ namespace armarx::armem
bool storeSensorData(const LaserScan& laserScan, const std::string& frame, const std::string& agentName, const std::int64_t& timestamp);
private:
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Writer memoryWriter;
// Properties
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
index 07fa4333c37a80b52569d1c54e3e4e843b13e4ef..7565a6aa227bb8d4d9d1a2a44b854c1343cd2fe2 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
@@ -22,7 +22,7 @@ namespace fs = ::std::filesystem;
namespace armarx::armem::robot_state
{
- RobotReader::RobotReader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ RobotReader::RobotReader(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem), transformReader(memoryNameSystem)
{
}
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
index 9847996cd08621f20e7e35276f5141ff0589f20c..13b5572d382059bcff17ce2bb5bfb04cc819b04b 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
@@ -44,7 +44,7 @@ namespace armarx::armem::robot_state
class RobotReader : virtual public robot::ReaderInterface
{
public:
- RobotReader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ RobotReader(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~RobotReader() = default;
void connect();
@@ -90,7 +90,7 @@ namespace armarx::armem::robot_state
const std::string propertyPrefix = "mem.robot_state.";
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Reader memoryReader;
std::mutex memoryWriterMutex;
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
index a59d7c6564e588a8f97a3b8d42b5538042567327..10e13611f3fd8608a5d0b5027fd92b960c3a7754 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
@@ -14,7 +14,7 @@
namespace armarx::armem::robot_state
{
- VirtualRobotReader::VirtualRobotReader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ VirtualRobotReader::VirtualRobotReader(armem::client::MemoryNameSystem& memoryNameSystem) :
RobotReader(memoryNameSystem)
{
}
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
index 373cacf7bedee74c7174c7a5f31a47a4908f82e1..e5945103cf4956fae90644b630cc61132624227b 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
@@ -41,7 +41,7 @@ namespace armarx::armem::robot_state
class VirtualRobotReader : virtual public RobotReader
{
public:
- VirtualRobotReader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ VirtualRobotReader(armem::client::MemoryNameSystem& memoryNameSystem);
virtual ~VirtualRobotReader() = default;
void connect();
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp
index cdbfc5a366ca6c019bd0afa18d8af160243ec893..6aa026431e7d9efd0128a9007d23918b291b54bc 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp
@@ -62,7 +62,7 @@
namespace armarx::armem::client::robot_state::localization
{
- TransformReader::TransformReader(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ TransformReader::TransformReader(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem) {}
TransformReader::~TransformReader() = default;
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h
index 14186e55199f89ad0bb5ea1222200cf2fc85120a..516769871608464d59aeb5318119dc5d5a1ab4f5 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h
@@ -44,7 +44,7 @@ namespace armarx::armem::client::robot_state::localization
virtual public TransformReaderInterface
{
public:
- TransformReader(const armem::client::MemoryNameSystem& memoryNameSystem);
+ TransformReader(armem::client::MemoryNameSystem& memoryNameSystem);
~TransformReader() override;
@@ -60,7 +60,7 @@ namespace armarx::armem::client::robot_state::localization
private:
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Reader memoryReader;
// Properties
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.cpp b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.cpp
index 87f9ac31d7161f6e53ec877c94bae9dcb15ac048..47660fc439e597f4c8f59bbcff666223c5964e18 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.cpp
@@ -54,7 +54,7 @@
namespace armarx::armem::client::robot_state::localization
{
- TransformWriter::TransformWriter(const armem::client::MemoryNameSystem& memoryNameSystem) :
+ TransformWriter::TransformWriter(armem::client::MemoryNameSystem& memoryNameSystem) :
memoryNameSystem(memoryNameSystem) {}
TransformWriter::~TransformWriter() = default;
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.h b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.h
index d0895f3b8957d56548100f9544fdb7e282416a5a..f69ab33f282c82599af7c66b43f7919fcba8114f 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.h
@@ -49,7 +49,7 @@ namespace armarx::armem::client::robot_state::localization
{
public:
- TransformWriter(const armem::client::MemoryNameSystem& memoryNameSystem);
+ TransformWriter(armem::client::MemoryNameSystem& memoryNameSystem);
~TransformWriter() override;
// TransformWriterInterface
@@ -63,7 +63,7 @@ namespace armarx::armem::client::robot_state::localization
private:
- armem::client::MemoryNameSystem memoryNameSystem;
+ armem::client::MemoryNameSystem& memoryNameSystem;
armem::client::Writer memoryWriter;
std::mutex memoryWriterMutex;