diff options
| author | Peter Horvath <ejcspii@gmail.com> | 2018-06-30 15:22:25 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus.mueller@ettus.com> | 2018-07-08 08:41:04 +0200 |
| commit | 0b752c07ef9a2597f1a8f6e910291eed3376e8aa (patch) | |
| tree | d04860f69c2f6237f76748d0720c1842456a6472 /gr-blocks/lib/message_strobe_random_impl.cc | |
| parent | 7247b50a23681475cdf88518b52fad3185321073 (diff) | |
Unbreak boost 1.67. Constrain the delay in message_strobe to integer milliseconds.
Diffstat (limited to 'gr-blocks/lib/message_strobe_random_impl.cc')
| -rw-r--r-- | gr-blocks/lib/message_strobe_random_impl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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; } |