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

Merge pull request #139 from ros2/cpplint-int

Browse source 
Replace unsigned long with uint32_t
This commit is contained in:
Esteve Fernandez 2015-10-28 15:10:53 -07:00
commit c76d3afbd3
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rclcpp/include/rclcpp/node_impl.hpp
View file

@ -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<unsigned long>::max)()) {
uint32_t number = strtoul(ros_domain_id, NULL, 0);
if (number == (std::numeric_limits<uint32_t>::max)()) {
throw std::runtime_error("failed to interpret ROS_DOMAIN_ID as integral number");
}
domain_id = static_cast<size_t>(number);

4
rclcpp/include/rclcpp/rclcpp.hpp
View file

@ -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);