tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6230 from jbeich/boost-1.67 

Unbreak build against Boost 1.67
This commit is contained in:
Jean Flach 2018-04-16 09:36:44 +02:00 committed by GitHub
parent 49fed7b7e0 106be295eb
commit b76ef91908
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/timer.cpp
View File

@ -292,7 +292,7 @@ void Timer::TimerThreadProc()
if (wait > 0.01) { if (wait > 0.01) {
/* Wait for the next timer. */ /* 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; continue;
} }

2
lib/checker/checkercomponent.cpp
View File

@ -125,7 +125,7 @@ void CheckerComponent::CheckThreadProc()
if (wait > 0) { if (wait > 0) {
/* Wait for the next check. */ /* 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; continue;
} }

2
lib/remote/eventqueue.cpp
View File

@ -108,7 +108,7 @@ Dictionary::Ptr EventQueue::WaitForEvent(void *client, double timeout)
return result; 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 nullptr; return nullptr;
} }
} }