summaryrefslogtreecommitdiff
path: root/gnuradio-runtime/lib/math
diff options
context:
space:
mode:
authorJohannes Demel <demel@ant.uni-bremen.de>2017-03-10 16:26:50 +0100
committerJohannes Demel <demel@ant.uni-bremen.de>2017-03-10 16:30:44 +0100
commitc987793229874b7345e939c174b21ef2e509aa8c (patch)
tree3696608df231e1cffb0807e298f9ef23851bc046 /gnuradio-runtime/lib/math
parent26475d40e123a139cd7029c5172612d6f59d9fd3 (diff)
replaced boost::random::uniform_int_distribution with boost::uniform_int to resolve issue 1227
Diffstat (limited to 'gnuradio-runtime/lib/math')
-rw-r--r--gnuradio-runtime/lib/math/random.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-runtime/lib/math/random.cc b/gnuradio-runtime/lib/math/random.cc
index 35f63076b2..0d37884373 100644
--- a/gnuradio-runtime/lib/math/random.cc
+++ b/gnuradio-runtime/lib/math/random.cc
@@ -51,7 +51,7 @@ namespace gr {
// Setup random number generators
d_rng = new boost::mt19937; // random numbers are generated here.
d_uniform = new boost::uniform_real<float>; // map random number to distribution
- d_integer_dis = new boost::random::uniform_int_distribution<>(0, 1); // another "mapper"
+ d_integer_dis = new boost::uniform_int<>(0, 1); // another "mapper"
d_generator = NULL; // MUST be reinstantiated on every call to reseed.
d_integer_generator = NULL; // MUST be reinstantiated on everytime d_rng or d_integer_dis is changed.
reseed(seed); // set seed for random number generator
@@ -80,16 +80,16 @@ namespace gr {
delete d_generator;
d_generator = new boost::variate_generator<boost::mt19937&, boost::uniform_real<float> > (*d_rng,*d_uniform); // create number generator in [0,1) from boost.random
delete d_integer_generator;
- d_integer_generator = new boost::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<> >(*d_rng, *d_integer_dis);
+ d_integer_generator = new boost::variate_generator<boost::mt19937&, boost::uniform_int<> >(*d_rng, *d_integer_dis);
}
void
random::set_integer_limits(const int minimum, const int maximum){
// boost expects integer limits defined as [minimum, maximum] which is unintuitive.
- boost::random::uniform_int_distribution<>::param_type dis_params(minimum, maximum - 1);
+ boost::uniform_int<>::param_type dis_params(minimum, maximum - 1);
d_integer_dis->param(dis_params);
delete d_integer_generator;
- d_integer_generator = new boost::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<> >(*d_rng, *d_integer_dis);
+ d_integer_generator = new boost::variate_generator<boost::mt19937&, boost::uniform_int<> >(*d_rng, *d_integer_dis);
}
/*!