From a0cf1b290fc6beeb2524ba20edce000f4fb35503 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Tue, 7 Mar 2023 15:02:52 +0100
Subject: [PATCH] VirtualRobotReader: nodiscard attribute for syncRobot
---
.../libraries/armem_objects/server/instance/Segment.cpp | 2 +-
.../armem_robot_state/client/common/VirtualRobotReader.h | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp b/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
index 3b22bf1d1..6d9a928a9 100644
--- a/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
+++ b/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
@@ -1317,7 +1317,7 @@ namespace armarx::armem::server::obj::instance
if (robot)
{
- reader->synchronizeRobot(*robot, Clock::Now());
+ ARMARX_CHECK(reader->synchronizeRobot(*robot, Clock::Now()));
// Store robot if valid.
loaded.emplace(robotName, robot);
}
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
index 19a184e8c..ab30cbc13 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
@@ -27,7 +27,6 @@
#include "RobotReader.h"
-
namespace armarx::armem::robot_state
{
/**
@@ -47,7 +46,8 @@ namespace armarx::armem::robot_state
void connect();
void registerPropertyDefinitions(::armarx::PropertyDefinitionsPtr& def);
- bool synchronizeRobot(VirtualRobot::Robot& robot, const armem::Time& timestamp);
+ [[nodiscard]] bool synchronizeRobot(VirtualRobot::Robot& robot,
+ const armem::Time& timestamp);
[[nodiscard]] VirtualRobot::RobotPtr
getRobot(const std::string& name,
@@ -70,14 +70,12 @@ namespace armarx::armem::robot_state
private:
-
[[nodiscard]] VirtualRobot::RobotPtr
_getSynchronizedRobot(const std::string& name,
const armem::Time& timestamp = armem::Time::Invalid(),
const VirtualRobot::RobotIO::RobotDescription& loadMode =
- VirtualRobot::RobotIO::RobotDescription::eStructure,
+ VirtualRobot::RobotIO::RobotDescription::eStructure,
bool blocking = true);
-
};
} // namespace armarx::armem::robot_state
--
GitLab