From 54cb15becd5ccb0dc9e179fbd97f3649a6ea2a64 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Wed, 28 Apr 2021 11:56:33 +0200
Subject: [PATCH] Fix overload of getEntity(), fix _checkContainerName() being
public
---
source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h | 6 +++---
source/RobotAPI/libraries/armem/core/base/MemoryBase.h | 6 +++---
.../libraries/armem/core/base/ProviderSegmentBase.h | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h b/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h
index 609920d1e..326a251a6 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 0d4c80209..60f7ee860 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 f6f760bc6..9cbfd4fac 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);
--
GitLab