Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI

source/RobotAPI/components/CMakeLists.txt

 add_subdirectory(units)
 
-#add_subdirectory(armem)
+add_subdirectory(armem)
 #add_subdirectory(aron)
 
 add_subdirectory(ArViz)

source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp

@@ -25,8 +25,7 @@
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 #include <ArmarXCore/core/time/CycleUtil.h>
 
-#include <RobotAPI/interface/aron.h>
-
+#include <RobotAPI/libraries/aron/aroncore/navigators/datanavigator/AronPrimitiveDataNavigator.h>
 #include <RobotAPI/libraries/armem/component/MemoryRemoteGui.h>
 #include <RobotAPI/libraries/armem/client/QueryBuilder.h>
 #include <RobotAPI/libraries/armem/memory/ice_conversions.h>
@@ -295,7 +294,11 @@ namespace armarx
 
         update.entityID = entityID;
         update.timeCreated = armem::Time::now();
-        update.instancesData = { new aron::data::AronData(), new aron::data::AronData() };
+        update.instancesData =
+        {
+            std::make_shared<aron::datanavigator::AronIntDataNavigator>(),
+            std::make_shared<aron::datanavigator::AronIntDataNavigator>()
+        };
 
         ARMARX_IMPORTANT
                 << "Committing:"
@@ -320,7 +323,7 @@ namespace armarx
             update.timeCreated = armem::Time::now() + armem::Time::seconds(i);
             for (int j = 0; j < i; ++j)
             {
-                update.instancesData.push_back(new aron::data::AronData());
+                update.instancesData.push_back(std::make_shared<aron::datanavigator::AronIntDataNavigator>());
             }
         }
         ARMARX_INFO << "Commiting " << commit.updates.size() << " more updates.";