Merge some minor changes from the development branch to remove some unnecessary differences.

[SVN r40131]
This commit is contained in:
Daniel James
2007-10-17 17:29:46 +00:00
parent 45d409c405
commit 1d34150bb9
4 changed files with 9 additions and 2 deletions

View File

@@ -17,6 +17,7 @@
#include <boost/limits.hpp>
#include <iostream>
#if defined(BOOST_MSVC)
#pragma warning(push)
#pragma warning(disable:4127) // conditional expression is constant

View File

@@ -44,7 +44,7 @@ namespace boost
# ifdef TEST_STD_INCLUDES
# include <functional>
# else
# include <boost/functional/hash/hash.hpp>
# include <boost/functional/hash.hpp>
# endif
#endif

View File

@@ -8,6 +8,7 @@
#else
#include <boost/preprocessor/cat.hpp>
#if defined(BOOST_MSVC)
#pragma warning(push)
#pragma warning(disable:4245) // signed/unsigned mismatch

View File

@@ -19,7 +19,7 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
template <class T>
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<T> hasher;