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

Merge pull request #178 from ros2/inline_helper_functions

Browse source 
inline helper functions in rclcpp.hpp to avoid multiple definitions
This commit is contained in:
Tully Foote 2015-12-15 17:23:05 -08:00
commit 4f9f152ce8
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/rclcpp.hpp
View file

@ -28,33 +28,33 @@
#include "rclcpp/visibility_control.hpp" #include "rclcpp/visibility_control.hpp"
// NOLINTNEXTLINE(runtime/int) // NOLINTNEXTLINE(runtime/int)
const std::chrono::seconds operator"" _s(unsigned long long s) inline const std::chrono::seconds operator"" _s(unsigned long long s)
{ {
return std::chrono::seconds(s); return std::chrono::seconds(s);
} }
const std::chrono::nanoseconds operator"" _s(long double s) inline const std::chrono::nanoseconds operator"" _s(long double s)
{ {
return std::chrono::duration_cast<std::chrono::nanoseconds>( return std::chrono::duration_cast<std::chrono::nanoseconds>(
std::chrono::duration<long double>(s)); std::chrono::duration<long double>(s));
} }
// NOLINTNEXTLINE(runtime/int) // NOLINTNEXTLINE(runtime/int)
const std::chrono::nanoseconds operator"" _ms(unsigned long long ms) inline const std::chrono::nanoseconds operator"" _ms(unsigned long long ms)
{ {
return std::chrono::milliseconds(ms); return std::chrono::milliseconds(ms);
} }
const std::chrono::nanoseconds operator"" _ms(long double ms) inline const std::chrono::nanoseconds operator"" _ms(long double ms)
{ {
return std::chrono::duration_cast<std::chrono::nanoseconds>( return std::chrono::duration_cast<std::chrono::nanoseconds>(
std::chrono::duration<long double, std::milli>(ms)); std::chrono::duration<long double, std::milli>(ms));
} }
// NOLINTNEXTLINE(runtime/int) // NOLINTNEXTLINE(runtime/int)
const std::chrono::nanoseconds operator"" _ns(unsigned long long ns) inline const std::chrono::nanoseconds operator"" _ns(unsigned long long ns)
{ {
return std::chrono::nanoseconds(ns); return std::chrono::nanoseconds(ns);
} }
const std::chrono::nanoseconds operator"" _ns(long double ns) inline const std::chrono::nanoseconds operator"" _ns(long double ns)
{ {
return std::chrono::duration_cast<std::chrono::nanoseconds>( return std::chrono::duration_cast<std::chrono::nanoseconds>(
std::chrono::duration<long double, std::nano>(ns)); std::chrono::duration<long double, std::nano>(ns));