diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp index 549b186..e264267 100644 --- a/hash/test/hash_range_test.cpp +++ b/hash/test/hash_range_test.cpp @@ -11,36 +11,45 @@ #include #include #include -#include BOOST_AUTO_UNIT_TEST(hash_range_tests) { - using namespace boost::assign; - std::vector empty, values1, values2, values3, values4, values5; - push_back(values1)(0); - push_back(values2)(10); - push_back(values3)(10)(20); - push_back(values4)(15)(75); - push_back(values5)(10)(20)(15)(75)(10)(20); + values1.push_back(0); + values2.push_back(10); + values3.push_back(10); + values3.push_back(20); + values4.push_back(15); + values4.push_back(75); + values5.push_back(10); + values5.push_back(20); + values5.push_back(15); + values5.push_back(75); + values5.push_back(10); + values5.push_back(20); std::vector x; - BOOST_CHECK(boost::hash_range(empty) == boost::hash_range(x)); - BOOST_CHECK(boost::hash_range(empty) == boost::hash_range(x.begin(), x.end())); - BOOST_CHECK(boost::hash_range(empty) != boost::hash_range(values1)); + BOOST_CHECK(boost::hash_range(empty.begin(), empty.end()) + == boost::hash_range(x.begin(), x.end())); + BOOST_CHECK(boost::hash_range(empty.begin(), empty.end()) + != boost::hash_range(values1.begin(), values1.end())); x.push_back(10); - BOOST_CHECK(boost::hash_range(empty) != boost::hash_range(x)); - BOOST_CHECK(boost::hash_range(values2) == boost::hash_range(x)); - BOOST_CHECk(boost::hash_range(values2) == boost::hash_range(x.begin(), x.end())); + BOOST_CHECK(boost::hash_range(empty.begin(), empty.end()) + != boost::hash_range(x.begin(), x.end())); + BOOST_CHECK(boost::hash_range(values2.begin(), values2.end()) + == boost::hash_range(x.begin(), x.end())); x.push_back(20); - BOOST_CHECK(boost::hash_range(empty) != boost::hash_range(x)); - BOOST_CHECK(boost::hash_range(values2) != boost::hash_range(x)); - BOOST_CHECK(boost::hash_range(values3) == boost::hash_range(x)); + BOOST_CHECK(boost::hash_range(empty.begin(), empty.end()) + != boost::hash_range(x.begin(), x.end())); + BOOST_CHECK(boost::hash_range(values2.begin(), values2.end()) + != boost::hash_range(x.begin(), x.end())); + BOOST_CHECK(boost::hash_range(values3.begin(), values3.end()) + == boost::hash_range(x.begin(), x.end())); - std::size_t seed = boost::hash_range(values3); - boost::hash_range(seed, boost::const_begin(values4), boost::const_end(values4)); - boost::hash_range(seed, x); - BOOST_CHECK(seed == boost::hash_range(values5)); + std::size_t seed = boost::hash_range(values3.begin(), values3.end()); + boost::hash_range(seed, values4.begin(), values4.end()); + boost::hash_range(seed, x.begin(), x.end()); + BOOST_CHECK(seed == boost::hash_range(values5.begin(), values5.end())); }