Merge branch 'armem/clean-up-interfaces' of https://gitlab.com/ArmarX/RobotAPI...
Merge branch 'armem/clean-up-interfaces' of https://gitlab.com/ArmarX/RobotAPI into armem/clean-up-interfaces # Conflicts: # source/RobotAPI/libraries/armem/CMakeLists.txt
No related branches found
No related tags found
Showing
- source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp 2 additions, 1 deletion...API/components/armem/server/SkillsMemory/SkillsMemory.cpp
- source/RobotAPI/libraries/armem/CMakeLists.txt 22 additions, 41 deletionssource/RobotAPI/libraries/armem/CMakeLists.txt
- source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h 5 additions, 19 deletionssource/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h
- source/RobotAPI/libraries/armem/core/base/EntityBase.cpp 0 additions, 7 deletionssource/RobotAPI/libraries/armem/core/base/EntityBase.cpp
- source/RobotAPI/libraries/armem/core/base/EntityBase.h 10 additions, 37 deletionssource/RobotAPI/libraries/armem/core/base/EntityBase.h
- source/RobotAPI/libraries/armem/core/base/MemoryBase.h 36 additions, 11 deletionssource/RobotAPI/libraries/armem/core/base/MemoryBase.h
- source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h 5 additions, 19 deletions.../RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h
- source/RobotAPI/libraries/armem/core/base/detail/iteration_mixins.h 23 additions, 18 deletions...otAPI/libraries/armem/core/base/detail/iteration_mixins.h
- source/RobotAPI/libraries/armem/core/base/ice_conversions.cpp 78 additions, 0 deletions...ce/RobotAPI/libraries/armem/core/base/ice_conversions.cpp
- source/RobotAPI/libraries/armem/core/base/ice_conversions.h 195 additions, 0 deletionssource/RobotAPI/libraries/armem/core/base/ice_conversions.h
- source/RobotAPI/libraries/armem/core/forward_declarations.h 52 additions, 0 deletionssource/RobotAPI/libraries/armem/core/forward_declarations.h
- source/RobotAPI/libraries/armem/core/ice_conversions.cpp 10 additions, 21 deletionssource/RobotAPI/libraries/armem/core/ice_conversions.cpp
- source/RobotAPI/libraries/armem/core/ice_conversions.h 4 additions, 19 deletionssource/RobotAPI/libraries/armem/core/ice_conversions.h
- source/RobotAPI/libraries/armem/core/ice_conversions_templates.h 5 additions, 2 deletions...RobotAPI/libraries/armem/core/ice_conversions_templates.h
- source/RobotAPI/libraries/armem/core/longtermmemory/Entity.cpp 0 additions, 5 deletions...e/RobotAPI/libraries/armem/core/longtermmemory/Entity.cpp
- source/RobotAPI/libraries/armem/core/longtermmemory/Entity.h 0 additions, 7 deletionssource/RobotAPI/libraries/armem/core/longtermmemory/Entity.h
- source/RobotAPI/libraries/armem/core/longtermmemory/EntitySnapshot.cpp 0 additions, 1 deletion...PI/libraries/armem/core/longtermmemory/EntitySnapshot.cpp
- source/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp 2 additions, 2 deletions...e/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp
- source/RobotAPI/libraries/armem/core/longtermmemory/Memory.h 2 additions, 0 deletionssource/RobotAPI/libraries/armem/core/longtermmemory/Memory.h
- source/RobotAPI/libraries/armem/core/wm/ice_conversions.cpp 25 additions, 147 deletionssource/RobotAPI/libraries/armem/core/wm/ice_conversions.cpp
Loading
Please register or sign in to comment