diff --git a/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h b/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h index 609920d1e6e80054f4526fffe4e76eca2c4a43a5..326a251a6a3a0a62034f01a9c11553bf8f180ec1 100644 --- a/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h +++ b/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h @@ -83,16 +83,16 @@ namespace armarx::armem::base } } - using Base::_checkContainerName; + using Base::getEntity; const EntityT& getEntity(const MemoryID& id) const override { - _checkContainerName(id.coreSegmentName, this->getKeyString()); + this->_checkContainerName(id.coreSegmentName, this->getKeyString()); return getProviderSegment(id.providerSegmentName).getEntity(id); } virtual MemoryID update(const EntityUpdate& update) override { - _checkContainerName(update.entityID.coreSegmentName, this->name()); + this->_checkContainerName(update.entityID.coreSegmentName, this->name()); auto it = this->_container.find(update.entityID.providerSegmentName); if (it != _container.end()) diff --git a/source/RobotAPI/libraries/armem/core/base/MemoryBase.h b/source/RobotAPI/libraries/armem/core/base/MemoryBase.h index 0d4c8020910ac140e61df0540136f2bcb0094e43..60f7ee86098c26463ffe14007362eadc114f3e9e 100644 --- a/source/RobotAPI/libraries/armem/core/base/MemoryBase.h +++ b/source/RobotAPI/libraries/armem/core/base/MemoryBase.h @@ -85,10 +85,10 @@ namespace armarx::armem::base } } - using Base::_checkContainerName; + using Base::getEntity; const EntityT& getEntity(const MemoryID& id) const override { - _checkContainerName(id.memoryName, this->name()); + this->_checkContainerName(id.memoryName, this->name()); return getCoreSegment(id.coreSegmentName).getEntity(id); } @@ -144,7 +144,7 @@ namespace armarx::armem::base virtual MemoryID update(const EntityUpdate& update) override { - _checkContainerName(update.entityID.memoryName, this->name()); + this->_checkContainerName(update.entityID.memoryName, this->name()); auto it = _container.find(update.entityID.coreSegmentName); if (it != _container.end()) diff --git a/source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h b/source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h index f6f760bc6976c165399cfeeb57f7ebd19cf0a91c..9cbfd4facde379fc5d3cc1f8f0d26631899e5811 100644 --- a/source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h +++ b/source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h @@ -65,10 +65,10 @@ namespace armarx::armem::base return _container.count(name) > 0; } - using Base::_checkContainerName; + using Base::getEntity; const EntityT& getEntity(const MemoryID& id) const override { - _checkContainerName(id.providerSegmentName, this->getKeyString()); + this->_checkContainerName(id.providerSegmentName, this->getKeyString()); return getEntity(id.entityName); } @@ -97,7 +97,7 @@ namespace armarx::armem::base */ virtual MemoryID update(const EntityUpdate& update) override { - _checkContainerName(update.entityID.providerSegmentName, this->name()); + this->_checkContainerName(update.entityID.providerSegmentName, this->name()); EntityT* entity; auto it = this->_container.find(update.entityID.providerSegmentName);