net-mgmt/icinga2: unbreak with boost 1.67

In file included from lib/base/base_unity.cpp:61:
lib/base/timer.cpp:269:31: error: no matching conversion for functional-style cast from 'double' to 'boost::posix_time::milliseconds' (aka 'subsecond_duration<boost::posix_time::time_duration, 1000>')
                        l_TimerCV.timed_wait(lock, boost::posix_time::milliseconds(wait * 1000));
                                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

PR:		227427
Reported by:	antoine (via exp-run)
This commit is contained in:
Jan Beich 2018-04-15 04:56:01 +00:00
parent 62980771f3
commit e7ef070b2c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=467365

View file

@ -0,0 +1,35 @@
https://github.com/Icinga/icinga2/pull/6230
--- lib/base/timer.cpp.orig 2018-03-22 10:26:19 UTC
+++ lib/base/timer.cpp
@@ -266,7 +266,7 @@ void Timer::TimerThreadProc(void)
if (wait > 0.01) {
/* Wait for the next timer. */
- l_TimerCV.timed_wait(lock, boost::posix_time::milliseconds(wait * 1000));
+ l_TimerCV.timed_wait(lock, boost::posix_time::milliseconds(long(wait * 1000)));
continue;
}
--- lib/checker/checkercomponent.cpp.orig 2018-03-22 10:26:19 UTC
+++ lib/checker/checkercomponent.cpp
@@ -130,7 +130,7 @@ void CheckerComponent::CheckThreadProc(void)
if (wait > 0) {
/* Wait for the next check. */
- m_CV.timed_wait(lock, boost::posix_time::milliseconds(wait * 1000));
+ m_CV.timed_wait(lock, boost::posix_time::milliseconds(long(wait * 1000)));
continue;
}
--- lib/remote/eventqueue.cpp.orig 2018-03-22 10:26:19 UTC
+++ lib/remote/eventqueue.cpp
@@ -114,7 +114,7 @@ Dictionary::Ptr EventQueue::WaitForEvent(void *client,
return result;
}
- if (!m_CV.timed_wait(lock, boost::posix_time::milliseconds(timeout * 1000)))
+ if (!m_CV.timed_wait(lock, boost::posix_time::milliseconds(long(timeout * 1000))))
return Dictionary::Ptr();
}
}