fix after changes to related to skills/dev

source/RobotAPI/libraries/armem_grasping/client/KnownGraspCandidateReader.h

@@ -56,7 +56,6 @@ namespace armarx::armem::grasping::known_grasps
         const std::string propertyPrefix = "mem.grasping.knowngrasps.";
 
         armem::client::Reader memoryReader;
-        mutable std::mutex memoryWriterMutex;
     };
 
 

source/RobotAPI/libraries/armem_objects/client/instance/ObjectWriter.h

@@ -57,7 +57,6 @@ namespace armarx::armem::obj::instance
         const std::string propertyPrefix = "mem.obj.instance.";
 
         armem::client::Writer memoryWriter;
-        mutable std::mutex memoryWriterMutex;
     };
 
 

source/RobotAPI/libraries/skills/provider/mixins/GraspReadingSkillMixin.h

@@ -10,8 +10,10 @@ namespace armarx::skills::mixin
     {
         armem::grasping::known_grasps::Reader graspReader;
 
-        GraspReadingSkillMixin(armem::client::MemoryNameSystem& mns) : graspReader(mns)
-        {}
+        GraspReadingSkillMixin(const armem::grasping::known_grasps::Reader& r) : graspReader(r)
+        {
+
+        }
     };
 
     struct SpecificGraspReadingSkillMixin
@@ -19,7 +21,7 @@ namespace armarx::skills::mixin
         std::string objectEntityId;
         armem::grasping::known_grasps::Reader graspReader;
 
-        SpecificGraspReadingSkillMixin(const std::string& n, armem::client::MemoryNameSystem& mns) : objectEntityId(n), graspReader(mns)
+        SpecificGraspReadingSkillMixin(const std::string& n, const armem::grasping::known_grasps::Reader& r) : objectEntityId(n), graspReader(r)
         {}
     };
 }

source/RobotAPI/libraries/skills/provider/mixins/MemoryReadingSkillMixin.h

@@ -10,7 +10,8 @@ namespace armarx::skills::mixin
     {
         armem::client::Reader memoryReader;
 
-        //MemoryReadingSkillMixin(armem::client::MemoryNameSystem& mns) : memoryReader(mns)
-        //{}
+        MemoryReadingSkillMixin(const armem::client::Reader& r) : memoryReader(r)
+        {
+        }
     };
-}
+} // namespace armarx::skills::mixin

source/RobotAPI/libraries/skills/provider/mixins/ObjectReadingSkillMixin.h

@@ -10,8 +10,9 @@ namespace armarx::skills::mixin
     {
         armem::obj::instance::Reader objectReader;
 
-        ObjectReadingSkillMixin(armem::client::MemoryNameSystem& mns) : objectReader(mns)
-        {}
+        ObjectReadingSkillMixin(const armem::obj::instance::Reader& r) : objectReader(r)
+        {
+        }
     };
 
     struct SpecificObjectReadingSkillMixin
@@ -19,7 +20,10 @@ namespace armarx::skills::mixin
         std::string objectEntityId;
         armem::obj::instance::Reader objectReader;
 
-        SpecificObjectReadingSkillMixin(const std::string& n, armem::client::MemoryNameSystem& mns) : objectEntityId(n), objectReader(mns)
-        {}
+        SpecificObjectReadingSkillMixin(const std::string& n,
+                                        const armem::obj::instance::Reader& r) :
+            objectEntityId(n), objectReader(r)
+        {
+        }
     };
-}
+} // namespace armarx::skills::mixin

source/RobotAPI/libraries/skills/provider/mixins/ObjectWritingSkillMixin.h

@@ -10,7 +10,8 @@ namespace armarx::skills::mixin
     {
         armem::obj::instance::Writer objectWriter;
 
-        ObjectWritingSkillMixin(armem::client::MemoryNameSystem& mns) : objectWriter(mns)
-        {}
+        ObjectWritingSkillMixin(const armem::obj::instance::Writer& r) : objectWriter(r)
+        {
+        }
     };
-}
+} // namespace armarx::skills::mixin

source/RobotAPI/libraries/skills/provider/mixins/RobotReadingSkillMixin.h

@@ -10,9 +10,9 @@ namespace armarx::skills::mixin
     {
         armem::robot_state::VirtualRobotReader robotReader;
 
-        RobotReadingSkillMixin(armem::client::MemoryNameSystem& mns) :
-            robotReader(mns)
-        {}
+        RobotReadingSkillMixin(const armem::robot_state::VirtualRobotReader& r) : robotReader(r)
+        {
+        }
     };
 
     struct SpecificRobotReadingSkillMixin
@@ -20,9 +20,10 @@ namespace armarx::skills::mixin
         std::string robotName;
         armem::robot_state::VirtualRobotReader robotReader;
 
-        SpecificRobotReadingSkillMixin(const std::string& rn, armem::client::MemoryNameSystem& mns) :
-            robotName(rn),
-            robotReader(mns)
-        {}
+        SpecificRobotReadingSkillMixin(const std::string& rn,
+                                       const armem::robot_state::VirtualRobotReader& r) :
+            robotName(rn), robotReader(r)
+        {
+        }
     };
-}
+} // namespace armarx::skills::mixin