Skip to content

Commit

Permalink
Merge pull request #6230 from jbeich/boost-1.67
Browse files Browse the repository at this point in the history
Unbreak build against Boost 1.67
  • Loading branch information
Crunsher committed Apr 16, 2018
2 parents 49fed7b + 106be29 commit b76ef91
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/base/timer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ void Timer::TimerThreadProc()

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;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/checker/checkercomponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void CheckerComponent::CheckThreadProc()

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;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/remote/eventqueue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Dictionary::Ptr EventQueue::WaitForEvent(void *client, double timeout)
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;
}
}
Expand Down

0 comments on commit b76ef91

Please sign in to comment.