mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
From b320213c6611cd0ab02034ec1ff1380e83dab8e1 Mon Sep 17 00:00:00 2001
|
|
From: ilovezfs <ilovezfs@icloud.com>
|
|
Date: Tue, 17 Apr 2018 03:25:30 -0700
|
|
Subject: [PATCH] Boost 1.67 compatibility
|
|
|
|
---
|
|
gr-blocks/lib/message_strobe_impl.cc | 2 +-
|
|
gr-blocks/lib/message_strobe_random_impl.cc | 2 +-
|
|
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;
|
|
}
|
|
}
|