From ef517035f114d35b7402ff03783c3017d549348a Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Fri, 16 Jan 2015 10:19:25 +0000 Subject: [PATCH] The file boost/random/uniform_int_distribution.hpp was introduced in boost version 1.47. If we have older Boost, use random numbers from libc. Signed-off-by: Mikulas Patocka --- unit-tests/bloom_filter_t.cc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/unit-tests/bloom_filter_t.cc b/unit-tests/bloom_filter_t.cc index 13c2418..bf44ffa 100644 --- a/unit-tests/bloom_filter_t.cc +++ b/unit-tests/bloom_filter_t.cc @@ -5,8 +5,16 @@ #include "persistent-data/data-structures/array_block.h" #include "test_utils.h" +#include + +#if BOOST_VERSION >= 104700 +#define HAVE_RANDOM_UNIFORM_INT_DISTRIBUTION +#endif + #include +#ifdef HAVE_RANDOM_UNIFORM_INT_DISTRIBUTION #include +#endif #include #include #include @@ -40,10 +48,16 @@ namespace { using namespace boost::random; +#ifdef HAVE_RANDOM_UNIFORM_INT_DISTRIBUTION boost::random::uniform_int_distribution uniform_dist(0, max); +#endif while (r.size() < count) { +#ifdef HAVE_RANDOM_UNIFORM_INT_DISTRIBUTION block_address b = uniform_dist(rng_); +#else + block_address b = random() % max; +#endif r.insert(b); } @@ -75,7 +89,9 @@ namespace { space_map::ptr sm_; transaction_manager tm_; +#ifdef HAVE_RANDOM_UNIFORM_INT_DISTRIBUTION boost::random::mt19937 rng_; +#endif }; } @@ -312,3 +328,4 @@ TEST_F(BloomFilterTests, false_positives_over_multiple_eras) } //---------------------------------------------------------------- +