From 1b2e171261bdbf99f433ad0f2c93f1c7b95799ff Mon Sep 17 00:00:00 2001 From: Esteve Fernandez Date: Wed, 28 Oct 2015 13:45:10 -0700 Subject: [PATCH] Replace unsigned long with uint32_t --- rclcpp/include/rclcpp/node_impl.hpp | 4 ++-- rclcpp/include/rclcpp/rclcpp.hpp | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rclcpp/include/rclcpp/node_impl.hpp b/rclcpp/include/rclcpp/node_impl.hpp index 02f08b2..8a9c730 100644 --- a/rclcpp/include/rclcpp/node_impl.hpp +++ b/rclcpp/include/rclcpp/node_impl.hpp @@ -66,8 +66,8 @@ Node::Node( _dupenv_s(&ros_domain_id, &ros_domain_id_size, env_var); #endif if (ros_domain_id) { - unsigned long number = strtoul(ros_domain_id, NULL, 0); - if (number == (std::numeric_limits::max)()) { + uint32_t number = strtoul(ros_domain_id, NULL, 0); + if (number == (std::numeric_limits::max)()) { throw std::runtime_error("failed to interpret ROS_DOMAIN_ID as integral number"); } domain_id = static_cast(number); diff --git a/rclcpp/include/rclcpp/rclcpp.hpp b/rclcpp/include/rclcpp/rclcpp.hpp index 371ff03..c91d31a 100644 --- a/rclcpp/include/rclcpp/rclcpp.hpp +++ b/rclcpp/include/rclcpp/rclcpp.hpp @@ -28,7 +28,7 @@ namespace rclcpp { - +// NOLINTNEXTLINE(runtime/int) const std::chrono::seconds operator"" _s(unsigned long long s) { return std::chrono::seconds(s); @@ -40,6 +40,7 @@ const std::chrono::nanoseconds operator"" _s(long double s) } const std::chrono::nanoseconds +// NOLINTNEXTLINE(runtime/int) operator"" _ms(unsigned long long ms) { return std::chrono::milliseconds(ms); @@ -52,6 +53,7 @@ operator"" _ms(long double ms) } const std::chrono::nanoseconds +// NOLINTNEXTLINE(runtime/int) operator"" _ns(unsigned long long ns) { return std::chrono::nanoseconds(ns);