From 0b752c07ef9a2597f1a8f6e910291eed3376e8aa Mon Sep 17 00:00:00 2001
From: Peter Horvath <ejcspii@gmail.com>
Date: Sat, 30 Jun 2018 15:22:25 +0200
Subject: Unbreak boost 1.67. Constrain the delay in message_strobe to integer
milliseconds.
---
gr-blocks/lib/message_strobe_random_impl.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'gr-blocks/lib/message_strobe_random_impl.cc')
diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc
index c62aad1c7a..a5c6693215 100644
--- a/gr-blocks/lib/message_strobe_random_impl.cc
+++ b/gr-blocks/lib/message_strobe_random_impl.cc
@@ -69,15 +69,15 @@ namespace gr {
boost::bind(&message_strobe_random_impl::set_msg, this, _1));
}
- float message_strobe_random_impl::next_delay(){
+ long message_strobe_random_impl::next_delay(){
switch(d_dist){
case STROBE_POISSON:
//return d_variate_poisson->operator()();
- return d_variate_poisson->operator()();
+ return static_cast<long>(d_variate_poisson->operator()());
case STROBE_GAUSSIAN:
- return d_variate_normal->operator()();
+ return static_cast<long>(d_variate_normal->operator()());
case STROBE_UNIFORM:
- return d_variate_uniform->operator()();
+ return static_cast<long>(d_variate_uniform->operator()());
default:
throw std::runtime_error("message_strobe_random_impl::d_distribution is very unhappy with you");
}
@@ -108,7 +108,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(std::max(0L, next_delay())));
if(d_finished) {
return;
}
--
cgit v1.2.3