Merge branch 'armem/refactor-inheritance' into 'armem/dev'
Refactor inheritance in armem/core See merge request ArmarX/RobotAPI!139
No related branches found
No related tags found
Showing
- scenarios/ArMemExample/config/ExampleMemory.cfg 10 additions, 2 deletionsscenarios/ArMemExample/config/ExampleMemory.cfg
- scenarios/ArMemExample/config/ExampleMemoryClient.cfg 2 additions, 2 deletionsscenarios/ArMemExample/config/ExampleMemoryClient.cfg
- scenarios/ArMemExample/config/MemoryNameSystem.cfg 1 addition, 1 deletionscenarios/ArMemExample/config/MemoryNameSystem.cfg
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui 33 additions, 29 deletions.../gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp 1 addition, 1 deletion...s/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
- source/RobotAPI/libraries/armem/CMakeLists.txt 6 additions, 9 deletionssource/RobotAPI/libraries/armem/CMakeLists.txt
- source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h 38 additions, 15 deletionssource/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h
- source/RobotAPI/libraries/armem/core/base/EntityBase.h 31 additions, 51 deletionssource/RobotAPI/libraries/armem/core/base/EntityBase.h
- source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h 17 additions, 12 deletions...e/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h
- source/RobotAPI/libraries/armem/core/base/EntitySnapshotBase.h 26 additions, 19 deletions...e/RobotAPI/libraries/armem/core/base/EntitySnapshotBase.h
- source/RobotAPI/libraries/armem/core/base/MemoryBase.h 23 additions, 18 deletionssource/RobotAPI/libraries/armem/core/base/MemoryBase.h
- source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h 38 additions, 15 deletions.../RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h
- source/RobotAPI/libraries/armem/core/base/detail/AronTyped.cpp 26 additions, 0 deletions...e/RobotAPI/libraries/armem/core/base/detail/AronTyped.cpp
- source/RobotAPI/libraries/armem/core/base/detail/AronTyped.h 32 additions, 0 deletionssource/RobotAPI/libraries/armem/core/base/detail/AronTyped.h
- source/RobotAPI/libraries/armem/core/base/detail/EntityContainerBase.h 4 additions, 6 deletions...PI/libraries/armem/core/base/detail/EntityContainerBase.h
- source/RobotAPI/libraries/armem/core/base/detail/MemoryContainerBase.h 11 additions, 10 deletions...PI/libraries/armem/core/base/detail/MemoryContainerBase.h
- source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.cpp 4 additions, 0 deletions.../RobotAPI/libraries/armem/core/base/detail/MemoryItem.cpp
- source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h 6 additions, 2 deletions...ce/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h
- source/RobotAPI/libraries/armem/core/base/detail/TypedEntityContainerBase.cpp 0 additions, 1 deletion...aries/armem/core/base/detail/TypedEntityContainerBase.cpp
- source/RobotAPI/libraries/armem/core/base/detail/TypedEntityContainerBase.h 0 additions, 96 deletions...braries/armem/core/base/detail/TypedEntityContainerBase.h
Loading
Please register or sign in to comment