Date: Sun, 15 Apr 2018 04:56:01 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467365 - head/net-mgmt/icinga2/files Message-ID: <201804150456.w3F4u1ZX028929@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Apr 15 04:56:01 2018 New Revision: 467365 URL: https://svnweb.freebsd.org/changeset/ports/467365 Log: 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) Added: head/net-mgmt/icinga2/files/patch-boost-1.67 (contents, props changed) Added: head/net-mgmt/icinga2/files/patch-boost-1.67 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/icinga2/files/patch-boost-1.67 Sun Apr 15 04:56:01 2018 (r467365) @@ -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(); + } + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804150456.w3F4u1ZX028929>