util/probing_hash_table_benchmark_main.cc wouldn't compile with boost v.1.46.1.

This commit is contained in:
Ulrich Germann 2015-05-20 23:46:01 +01:00
parent d8406e3f51
commit 044bfd0b1a

View File

@ -1,9 +1,18 @@
#include "util/probing_hash_table.hh"
#include "util/scoped.hh"
#include "util/usage.hh"
#include <boost/random/mersenne_twister.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION / 100000 < 1
#error BOOST_LIB_VERSION is to old. Time to upgrade.
#elif BOOST_VERSION / 100000 > 1 || BOOST_VERSION / 100 % 1000 > 46
#include <boost/random/uniform_int_distribution.hpp>
#define have_uniform_int_distribution
#else
#include <boost/random/uniform_int.hpp>
#endif
#include <iostream>
@ -22,8 +31,13 @@ void Test(uint64_t entries, uint64_t lookups, float multiplier = 1.5) {
std::size_t size = Table::Size(entries, multiplier);
scoped_malloc backing(util::CallocOrThrow(size));
Table table(backing.get(), size);
#ifdef have_uniform_int_distribution
boost::random::mt19937 gen;
boost::random::uniform_int_distribution<> dist(std::numeric_limits<uint64_t>::min(), std::numeric_limits<uint64_t>::max());
#else
boost::mt19937 gen;
boost::uniform_int<> dist(std::numeric_limits<uint64_t>::min(), std::numeric_limits<uint64_t>::max());
#endif
double start = UserTime();
for (uint64_t i = 0; i < entries; ++i) {
Entry entry;