niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #332 from ros2/move_time

Browse source 
use time from rcutils
This commit is contained in:
Dirk Thomas 2017-06-01 22:11:15 -07:00 • committed by GitHub
commit c0a78bac37
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rclcpp/include/rclcpp/time.hpp
View file

@ -31,22 +31,22 @@ public:
static Time static Time
now() now()
{ {
rcl_time_point_value_t rcl_now = 0; rcutils_time_point_value_t rcutils_now = 0;
rcl_ret_t ret = RCL_RET_ERROR; rcutils_ret_t ret = RCUTILS_RET_ERROR;
if (ClockT == RCL_ROS_TIME) { if (ClockT == RCL_ROS_TIME) {
throw std::runtime_error("RCL_ROS_TIME is currently not implemented."); throw std::runtime_error("RCL_ROS_TIME is currently not implemented.");
ret = false; ret = false;
} else if (ClockT == RCL_SYSTEM_TIME) { } else if (ClockT == RCL_SYSTEM_TIME) {
ret = rcl_system_time_now(&rcl_now); ret = rcutils_system_time_now(&rcutils_now);
} else if (ClockT == RCL_STEADY_TIME) { } else if (ClockT == RCL_STEADY_TIME) {
ret = rcl_steady_time_now(&rcl_now); ret = rcutils_steady_time_now(&rcutils_now);
} }
if (ret != RCL_RET_OK) { if (ret != RCUTILS_RET_OK) {
rclcpp::exceptions::throw_from_rcl_error( rclcpp::exceptions::throw_from_rcl_error(
ret, "Could not get current time: "); ret, "Could not get current time: ");
} }
return Time(std::move(rcl_now)); return Time(std::move(rcutils_now));
} }
operator builtin_interfaces::msg::Time() const operator builtin_interfaces::msg::Time() const