diff options
| author | ilovezfs <ilovezfs@icloud.com> | 2018-04-17 03:25:30 -0700 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-04-18 19:45:50 +0200 |
| commit | 86fa85feef81e69dd1354b393118459340b94489 (patch) | |
| tree | b1331bbcfdf5ea0939026cb2419938c888394259 | |
| parent | d19965e42d12bba66e39fd20794c69c69c48b31f (diff) | |
Boost 1.67 compatibility
| -rw-r--r-- | gr-blocks/lib/message_strobe_impl.cc | 2 | ||||
| -rw-r--r-- | gr-blocks/lib/message_strobe_random_impl.cc | 2 | ||||
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc index 059584e636..cee7bfccf3 100644 --- a/gr-blocks/lib/message_strobe_impl.cc +++ b/gr-blocks/lib/message_strobe_impl.cc @@ -91,7 +91,7 @@ namespace gr { void message_strobe_impl::run() { while(!d_finished) { - boost::this_thread::sleep(boost::posix_time::milliseconds(d_period_ms)); + boost::this_thread::sleep(boost::posix_time::milliseconds(static_cast<long>(d_period_ms))); if(d_finished) { return; } diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc index ab9422717c..08bfd1ff1f 100644 --- a/gr-blocks/lib/message_strobe_random_impl.cc +++ b/gr-blocks/lib/message_strobe_random_impl.cc @@ -110,7 +110,7 @@ namespace gr { void message_strobe_random_impl::run() { while(!d_finished) { - boost::this_thread::sleep(boost::posix_time::milliseconds(std::max(0.0f,next_delay()))); + boost::this_thread::sleep(boost::posix_time::milliseconds(static_cast<long>(std::max(0.0f,next_delay())))); if(d_finished) { return; } diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc index 70256d3071..84a6791cf7 100644 --- a/gr-uhd/lib/usrp_block_impl.cc +++ b/gr-uhd/lib/usrp_block_impl.cc @@ -196,7 +196,7 @@ bool usrp_block_impl::_wait_for_locked_sensor( while (true) { if ((not first_lock_time.is_not_a_date_time()) and - (boost::get_system_time() > (first_lock_time + boost::posix_time::seconds(LOCK_TIMEOUT)))) { + (boost::get_system_time() > (first_lock_time + boost::posix_time::seconds(static_cast<long>(LOCK_TIMEOUT))))) { break; } @@ -207,7 +207,7 @@ bool usrp_block_impl::_wait_for_locked_sensor( else { first_lock_time = boost::system_time(); //reset to 'not a date time' - if (boost::get_system_time() > (start + boost::posix_time::seconds(LOCK_TIMEOUT))){ + if (boost::get_system_time() > (start + boost::posix_time::seconds(static_cast<long>(LOCK_TIMEOUT)))){ return false; } } |