diff --git a/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h b/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h index 5e22ba7036a7d0b94a4a329e3d73e591b29a9543..cd8beedca7ecfe844df297963b4f0a2644345d2a 100644 --- a/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h +++ b/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h @@ -55,15 +55,15 @@ namespace armarx::armem::base CoreSegmentBase() { } - CoreSegmentBase(const std::string& name, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : + explicit CoreSegmentBase(const std::string& name, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : CoreSegmentBase(MemoryID().withCoreSegmentName(name), aronType) { } - CoreSegmentBase(const std::string& name, const MemoryID& parentID, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : + explicit CoreSegmentBase(const std::string& name, const MemoryID& parentID, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : CoreSegmentBase(parentID.withProviderSegmentName(name), aronType) { } - CoreSegmentBase(const MemoryID& id, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : + explicit CoreSegmentBase(const MemoryID& id, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : Base(id), AronTyped(aronType) { diff --git a/source/RobotAPI/libraries/armem/core/base/EntityBase.h b/source/RobotAPI/libraries/armem/core/base/EntityBase.h index 0775a71f977fde16966550f0506e9fd0f591e9a5..f8c19146cfb37131b4fc4df21f001df51389b2ad 100644 --- a/source/RobotAPI/libraries/armem/core/base/EntityBase.h +++ b/source/RobotAPI/libraries/armem/core/base/EntityBase.h @@ -66,11 +66,11 @@ namespace armarx::armem::base EntityBase() { } - EntityBase(const std::string& name, const MemoryID& parentID = {}) : + explicit EntityBase(const std::string& name, const MemoryID& parentID = {}) : EntityBase(parentID.withEntityName(name)) { } - EntityBase(const MemoryID& id) : + explicit EntityBase(const MemoryID& id) : Base(id) { } diff --git a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h index 8dd474c667687e6235a96a191e577163ca194cba..18f3319d190ad5d0c1e10492ae0efd04d5742bde 100644 --- a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h +++ b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h @@ -27,11 +27,11 @@ namespace armarx::armem::base EntityInstanceBase() { } - EntityInstanceBase(int index, const MemoryID& parentID = {}) : + explicit EntityInstanceBase(int index, const MemoryID& parentID = {}) : EntityInstanceBase(parentID.withInstanceIndex(index)) { } - EntityInstanceBase(const MemoryID& id) : + explicit EntityInstanceBase(const MemoryID& id) : Base(id) { } diff --git a/source/RobotAPI/libraries/armem/core/base/EntitySnapshotBase.h b/source/RobotAPI/libraries/armem/core/base/EntitySnapshotBase.h index cf68286be26368cb4821fecbbe241e3ef33e0fbe..70cc7c505cbf30b59c4d75a3d12ff568bf878f1f 100644 --- a/source/RobotAPI/libraries/armem/core/base/EntitySnapshotBase.h +++ b/source/RobotAPI/libraries/armem/core/base/EntitySnapshotBase.h @@ -34,11 +34,11 @@ namespace armarx::armem::base EntitySnapshotBase() { } - EntitySnapshotBase(Time time, const MemoryID& parentID = {}) : + explicit EntitySnapshotBase(Time time, const MemoryID& parentID = {}) : EntitySnapshotBase(parentID.withTimestamp(time)) { } - EntitySnapshotBase(const MemoryID& id) : + explicit EntitySnapshotBase(const MemoryID& id) : Base(id) { } diff --git a/source/RobotAPI/libraries/armem/core/base/MemoryBase.h b/source/RobotAPI/libraries/armem/core/base/MemoryBase.h index 1bc42b0cc579dbf8abe4f2831608166451ff8fbb..47c7dfb83f7f2e00259b25ebc862c18f546646a3 100644 --- a/source/RobotAPI/libraries/armem/core/base/MemoryBase.h +++ b/source/RobotAPI/libraries/armem/core/base/MemoryBase.h @@ -57,11 +57,11 @@ namespace armarx::armem::base MemoryBase() { } - MemoryBase(const std::string& name) : + explicit MemoryBase(const std::string& name) : MemoryBase(MemoryID().withMemoryName(name)) { } - MemoryBase(const MemoryID& id) : + explicit MemoryBase(const MemoryID& id) : Base(id) { } diff --git a/source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h b/source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h index 57ff3210244fa516551f4906a2ea07c2cc81f09d..8c335016fbb5f53a9274988868b22e60c27afe19 100644 --- a/source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h +++ b/source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h @@ -53,15 +53,15 @@ namespace armarx::armem::base { } - ProviderSegmentBase(const std::string& name, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : + explicit ProviderSegmentBase(const std::string& name, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : ProviderSegmentBase(MemoryID().withProviderSegmentName(name), aronType) { } - ProviderSegmentBase(const std::string& name, const MemoryID parentID, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : + explicit ProviderSegmentBase(const std::string& name, const MemoryID parentID, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : ProviderSegmentBase(parentID.withProviderSegmentName(name), aronType) { } - ProviderSegmentBase(const MemoryID id, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : + explicit ProviderSegmentBase(const MemoryID id, aron::typenavigator::ObjectNavigatorPtr aronType = nullptr) : Base(id), AronTyped(aronType) { diff --git a/source/RobotAPI/libraries/armem/core/base/detail/AronTyped.h b/source/RobotAPI/libraries/armem/core/base/detail/AronTyped.h index fb0ad088fb4fb27ca39cf09f034ea7eb3b202cfe..37c0e13aa486a8fca645359e1c4e07b189c6c28d 100644 --- a/source/RobotAPI/libraries/armem/core/base/detail/AronTyped.h +++ b/source/RobotAPI/libraries/armem/core/base/detail/AronTyped.h @@ -13,7 +13,7 @@ namespace armarx::armem::base::detail { public: - AronTyped(aron::typenavigator::ObjectNavigatorPtr aronType = nullptr); + explicit AronTyped(aron::typenavigator::ObjectNavigatorPtr aronType = nullptr); bool hasAronType() const; diff --git a/source/RobotAPI/libraries/armem/core/base/detail/MemoryContainerBase.h b/source/RobotAPI/libraries/armem/core/base/detail/MemoryContainerBase.h index 518e3f877f38ea364657c0a5448d48bc6cf36fbf..160826950eab78ac8e935b43aa663bcc2b19963e 100644 --- a/source/RobotAPI/libraries/armem/core/base/detail/MemoryContainerBase.h +++ b/source/RobotAPI/libraries/armem/core/base/detail/MemoryContainerBase.h @@ -18,16 +18,16 @@ namespace armarx::armem::base::detail using Base = MemoryItem; public: + using DerivedT = _DerivedT; using ContainerT = _ContainerT; public: - MemoryContainerBase() {} - MemoryContainerBase(const MemoryID& id) : + explicit MemoryContainerBase(const MemoryID& id) : MemoryItem(id) { } diff --git a/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h b/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h index 45226e6327520b7bbddc198364c16c2b8229352c..c70c68adad1e8bfd6362f31ad1a2f5be03d9de2e 100644 --- a/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h +++ b/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h @@ -16,7 +16,7 @@ namespace armarx::armem::base::detail public: MemoryItem(); - MemoryItem(const MemoryID& id); + explicit MemoryItem(const MemoryID& id); MemoryItem(const MemoryItem& other) = default; MemoryItem(MemoryItem&& other) = default;