diff options
| author | jbeich <jbeich@FreeBSD.org> | 2018-04-15 12:56:01 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2018-04-15 12:56:01 +0800 |
| commit | 2f7cf15dd82d9378346282beb60bb2cc430162e9 (patch) | |
| tree | 1591bb7209dddfe29bdcdbe5513caa44254c791f | |
| parent | 146e1d3283b6f067299880ee7a3033fa3c46f121 (diff) | |
| download | freebsd-ports-gnome-2f7cf15dd82d9378346282beb60bb2cc430162e9.tar.gz freebsd-ports-gnome-2f7cf15dd82d9378346282beb60bb2cc430162e9.tar.zst freebsd-ports-gnome-2f7cf15dd82d9378346282beb60bb2cc430162e9.zip | |
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)
| -rw-r--r-- | net-mgmt/icinga2/files/patch-boost-1.67 | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/net-mgmt/icinga2/files/patch-boost-1.67 b/net-mgmt/icinga2/files/patch-boost-1.67 new file mode 100644 index 000000000000..821f857642f6 --- /dev/null +++ b/net-mgmt/icinga2/files/patch-boost-1.67 @@ -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(); + } + } |