From 37ba531408529445973780178dae32c3676dc812 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 17 Oct 2007 17:29:46 +0000 Subject: [PATCH] Merge some minor changes from the development branch to remove some unnecessary differences. [SVN r40131] --- hash/test/hash_float_test.hpp | 1 + hash/test/hash_global_namespace_test.cpp | 2 +- hash/test/hash_map_test.hpp | 1 + hash/test/hash_set_test.hpp | 7 ++++++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp index 78d12c6..2fda7b8 100644 --- a/hash/test/hash_float_test.hpp +++ b/hash/test/hash_float_test.hpp @@ -17,6 +17,7 @@ #include #include + #if defined(BOOST_MSVC) #pragma warning(push) #pragma warning(disable:4127) // conditional expression is constant diff --git a/hash/test/hash_global_namespace_test.cpp b/hash/test/hash_global_namespace_test.cpp index 7ca512a..a64f5eb 100644 --- a/hash/test/hash_global_namespace_test.cpp +++ b/hash/test/hash_global_namespace_test.cpp @@ -44,7 +44,7 @@ namespace boost # ifdef TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/hash/test/hash_map_test.hpp b/hash/test/hash_map_test.hpp index 31723d5..1a56282 100644 --- a/hash/test/hash_map_test.hpp +++ b/hash/test/hash_map_test.hpp @@ -8,6 +8,7 @@ #else #include + #if defined(BOOST_MSVC) #pragma warning(push) #pragma warning(disable:4245) // signed/unsigned mismatch diff --git a/hash/test/hash_set_test.hpp b/hash/test/hash_set_test.hpp index 7eda536..50791a6 100644 --- a/hash/test/hash_set_test.hpp +++ b/hash/test/hash_set_test.hpp @@ -19,7 +19,7 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests) template void integer_tests(T* = 0) { - const int number_of_containers = 11; + const int number_of_containers = 12; T containers[number_of_containers]; for(int i = 0; i < 5; ++i) { @@ -35,6 +35,11 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests) containers[9].insert(-1); containers[10].insert(-1); containers[10].insert(1); + containers[11].insert(1); + containers[11].insert(2); + containers[11].insert(3); + containers[11].insert(4); + containers[11].insert(5); HASH_NAMESPACE::hash hasher;