summarylogtreecommitdiffstats
path: root/0001-boost_time.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-boost_time.patch')
-rw-r--r--0001-boost_time.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/0001-boost_time.patch b/0001-boost_time.patch
new file mode 100644
index 000000000000..bc656ee59cd4
--- /dev/null
+++ b/0001-boost_time.patch
@@ -0,0 +1,34 @@
+From e98177c7fb95fdfb40dcb0c7ad3adce2ba5d8b74 Mon Sep 17 00:00:00 2001
+From: Franck Lucien Duriez <franck@keecker.com>
+Date: Mon, 17 Dec 2018 12:53:50 +0100
+Subject: [PATCH] boost_time
+
+---
+ src/libros/callback_queue.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libros/callback_queue.cpp b/src/libros/callback_queue.cpp
+index cd2f4f8..bd422f7 100644
+--- a/src/libros/callback_queue.cpp
++++ b/src/libros/callback_queue.cpp
+@@ -229,7 +229,7 @@ CallbackQueue::CallOneResult CallbackQueue::callOne(ros::WallDuration timeout)
+ {
+ if (!timeout.isZero())
+ {
+- condition_.timed_wait(lock, boost::posix_time::microseconds(timeout.toSec() * 1000000.0f));
++ condition_.timed_wait(lock, boost::posix_time::microseconds(long(timeout.toSec() * 1000000.f)));
+ }
+
+ if (callbacks_.empty())
+@@ -305,7 +305,7 @@ void CallbackQueue::callAvailable(ros::WallDuration timeout)
+ {
+ if (!timeout.isZero())
+ {
+- condition_.timed_wait(lock, boost::posix_time::microseconds(timeout.toSec() * 1000000.0f));
++ condition_.timed_wait(lock, boost::posix_time::microseconds(long(timeout.toSec() * 1000000.0f)));
+ }
+
+ if (callbacks_.empty() || !enabled_)
+--
+2.20.0
+