diff options
| author | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
| commit | 254fe5e89403d4de1fa6663d09efdf946996aff3 (patch) | |
| tree | 62877d7ac7fdedf6c397c51e22ac6f97eba97ddf /gr-blocks/lib/message_strobe_random_impl.cc | |
| parent | 896d1c9da31963ecf5b0d90942c2af51ca998a69 (diff) | |
| parent | 5ad935c3a3dd46ce2860b13e2b774e4841784616 (diff) | |
Merge remote-tracking branch 'origin/next' into merge_next
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 08bfd1ff1f..5c2055ddbd 100644 --- a/gr-blocks/lib/message_strobe_random_impl.cc +++ b/gr-blocks/lib/message_strobe_random_impl.cc @@ -71,15 +71,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"); } @@ -110,7 +110,7 @@ namespace gr { void message_strobe_random_impl::run() { while(!d_finished) { - boost::this_thread::sleep(boost::posix_time::milliseconds(static_cast<long>(std::max(0.0f,next_delay())))); + boost::this_thread::sleep(boost::posix_time::milliseconds(std::max(0L, next_delay()))); if(d_finished) { return; } |