diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.cpp index dbc68923c98f1974c7fbd224f09ad94c625ff6b7..d5318e1f1e6ec9933ddc7e6b50f3894044111917 100644 --- a/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.cpp +++ b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.cpp @@ -34,8 +34,8 @@ namespace armarx::armem::server::ltm return _id.getLeafItem(); } - void MemoryItem::setMemoryName(const std::string& m) + void MemoryItem::setMemoryName(const std::string& memoryName) { - _id.memoryName = m; + _id.memoryName = memoryName; } } // namespace armarx::armem::server::ltm diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h index 586d4d0e51dcb546eaae28d7cbc984893c548ca8..b8d17fe471c17e62aa188406648515e5a32f384a 100644 --- a/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h +++ b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h @@ -21,7 +21,7 @@ namespace armarx::armem::server::ltm std::string name() const; virtual void setMemoryID(const MemoryID&); - void setMemoryName(const std::string&); + void setMemoryName(const std::string& memoryName); protected: std::shared_ptr<Processors> processors; diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp index 8253755604e04e1d65c4f7a67e6c04857eb52669..02a1d846f09bc0f39c41ac4090425b4f1b2c47d5 100644 --- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp +++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp @@ -436,11 +436,11 @@ namespace armarx::armem::gui } else { - ARMARX_INFO << "No memory with name " << name << " available for commit. Create new virtual memory."; + ARMARX_INFO << "No memory with name '" << name << "' available for commit. Create new virtual memory."; // Please note: Here we assume that a memory server with the same name does not exist. // I think this assumption is ok, since nobody should use filepaths as memory name. - // Nontheless, we did not restrict the user to do so... + // Nonetheless, we did not restrict the user to do so... std::string virtualMemoryName = name + " (at " + path.string() + ")"; wm::Memory virtualMemory(virtualMemoryName); virtualMemory.update(commit, true, false);