From f8e1ec8d2b364b7eade8fd3dbb97226fd81317c1 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 30 Apr 2009 05:08:40 +0000 Subject: [PATCH] Revert changes to unordered, as the test fails on most compilers. [SVN r52673] --- include/boost/unordered/detail/hash_table.hpp | 2 +- test/unordered/Jamfile.v2 | 1 - test/unordered/detail_tests.cpp | 32 ------------------- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 test/unordered/detail_tests.cpp diff --git a/include/boost/unordered/detail/hash_table.hpp b/include/boost/unordered/detail/hash_table.hpp index 2a7431ff..26a0455a 100644 --- a/include/boost/unordered/detail/hash_table.hpp +++ b/include/boost/unordered/detail/hash_table.hpp @@ -83,7 +83,7 @@ namespace boost { 1610612741ul, 3221225473ul, 4294967291ul }; template - std::ptrdiff_t const prime_list_template::length = 40; + std::ptrdiff_t const prime_list_template::length = 28; typedef prime_list_template prime_list; diff --git a/test/unordered/Jamfile.v2 b/test/unordered/Jamfile.v2 index a524fa31..9ecec284 100644 --- a/test/unordered/Jamfile.v2 +++ b/test/unordered/Jamfile.v2 @@ -37,5 +37,4 @@ test-suite unordered [ run rehash_tests.cpp ] [ run equality_tests.cpp ] [ run swap_tests.cpp : : : BOOST_UNORDERED_SWAP_METHOD=2 ] - [ run detail_tests.cpp ] ; diff --git a/test/unordered/detail_tests.cpp b/test/unordered/detail_tests.cpp deleted file mode 100644 index 757f6aee..00000000 --- a/test/unordered/detail_tests.cpp +++ /dev/null @@ -1,32 +0,0 @@ - -// Copyright 2009 Daniel James. -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// Test some of the library's implementation details. - -#include -#include - -#include -#include - -int main() { - - // Test that the prime list has the right length. - // - // It would have been better to automatically set the length in the header - // but that doesn't work on some compilers. It's okay that this isn't tested - // on all compilers, as it really only needs to be checked on one. - -#if !defined(BOOST_MSVC) - - BOOST_TEST_EQ( - boost::end(boost::unordered_detail::prime_list::value) - - boost::begin(boost::unordered_detail::prime_list::value), - boost::unordered_detail::prime_list::length); - -#endif - - return boost::report_errors(); -} \ No newline at end of file