Skip to content

Commit

Permalink
argument to boost microseconds must be integral (#79)
Browse files Browse the repository at this point in the history
With Boost >= 1.67 compilation fails because now it requires the
constructor argument to be integral.
  • Loading branch information
lsolanka authored and dirk-thomas committed Jun 6, 2018
1 parent fecdbc6 commit 1ccd276
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rostime/include/ros/impl/duration.h
Expand Up @@ -179,7 +179,7 @@ namespace ros {
#if defined(BOOST_DATE_TIME_HAS_NANOSECONDS)
return bt::seconds(sec) + bt::nanoseconds(nsec);
#else
return bt::seconds(sec) + bt::microseconds(nsec/1000.0);
return bt::seconds(sec) + bt::microseconds(nsec/1000);
#endif
}
}
Expand Down
2 changes: 1 addition & 1 deletion rostime/include/ros/impl/time.h
Expand Up @@ -167,7 +167,7 @@ namespace ros
#if defined(BOOST_DATE_TIME_HAS_NANOSECONDS)
return pt::from_time_t(sec) + pt::nanoseconds(nsec);
#else
return pt::from_time_t(sec) + pt::microseconds(nsec/1000.0);
return pt::from_time_t(sec) + pt::microseconds(nsec/1000);
#endif
}

Expand Down

0 comments on commit 1ccd276

Please sign in to comment.