Merge branch 'master' into names

source/RobotAPI/libraries/armem_vision/client/occupancy_grid/Writer.cpp

@@ -13,9 +13,7 @@ namespace armarx::armem::vision::occupancy_grid::client
                   const std::string& providerName,
                   const std::int64_t& timestamp)
     {
-        static std::mutex mutex;
-
-        std::lock_guard g{mutex};
+        std::lock_guard g{writeMutex};
 
         const auto result = memoryWriter().addSegment(properties().coreSegmentName, providerName);
 

source/RobotAPI/libraries/armem_vision/client/occupancy_grid/Writer.h

@@ -55,8 +55,10 @@ namespace armarx::armem::vision::occupancy_grid::client
     protected:
         std::string propertyPrefix() const override;
         Properties defaultProperties() const override;
-    };
 
+    private:
+        std::mutex writeMutex;
+    };
 
 
 } // namespace armarx::armem::vision::occupancy_grid::client