forked from pool/gnuradio
02432f7c7d
- boost_161.patch: fix compilation with Boost 1.67 (bsc#1089806) - missing_library.patch: hack to fix linking with required libraries. - use memory-constraints package instead of _constraints OBS-URL: https://build.opensuse.org/request/show/612995 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=16
49 lines
2.2 KiB
Diff
49 lines
2.2 KiB
Diff
Index: gnuradio-3.7.12.0/gr-blocks/lib/message_strobe_impl.cc
|
|
===================================================================
|
|
--- gnuradio-3.7.12.0.orig/gr-blocks/lib/message_strobe_impl.cc
|
|
+++ gnuradio-3.7.12.0/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::microseconds(static_cast<long>(d_period_ms * 1000)));
|
|
if(d_finished) {
|
|
return;
|
|
}
|
|
Index: gnuradio-3.7.12.0/gr-uhd/lib/usrp_block_impl.cc
|
|
===================================================================
|
|
--- gnuradio-3.7.12.0.orig/gr-uhd/lib/usrp_block_impl.cc
|
|
+++ gnuradio-3.7.12.0/gr-uhd/lib/usrp_block_impl.cc
|
|
@@ -196,7 +196,7 @@ bool usrp_block_impl::_wait_for_locked_s
|
|
|
|
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::milliseconds(static_cast<long>(1000*LOCK_TIMEOUT))))) {
|
|
break;
|
|
}
|
|
|
|
@@ -207,7 +207,7 @@ bool usrp_block_impl::_wait_for_locked_s
|
|
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::milliseconds(static_cast<long>(1000*LOCK_TIMEOUT)))){
|
|
return false;
|
|
}
|
|
}
|
|
Index: gnuradio-3.7.12.0/gr-blocks/lib/message_strobe_random_impl.cc
|
|
===================================================================
|
|
--- gnuradio-3.7.12.0.orig/gr-blocks/lib/message_strobe_random_impl.cc
|
|
+++ gnuradio-3.7.12.0/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::microseconds(std::max(0L,static_cast<long>(next_delay()))));
|
|
if(d_finished) {
|
|
return;
|
|
}
|