|
Boost-Commit : |
From: daniel_james_at_[hidden]
Date: 2007-10-17 13:29:47
Author: danieljames
Date: 2007-10-17 13:29:46 EDT (Wed, 17 Oct 2007)
New Revision: 40131
URL: http://svn.boost.org/trac/boost/changeset/40131
Log:
Merge some minor changes from the development branch to remove some unnecessary differences.
Text files modified:
trunk/libs/functional/hash/test/hash_float_test.hpp | 1 +
trunk/libs/functional/hash/test/hash_global_namespace_test.cpp | 2 +-
trunk/libs/functional/hash/test/hash_map_test.hpp | 1 +
trunk/libs/functional/hash/test/hash_set_test.hpp | 7 ++++++-
4 files changed, 9 insertions(+), 2 deletions(-)
Modified: trunk/libs/functional/hash/test/hash_float_test.hpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_float_test.hpp (original)
+++ trunk/libs/functional/hash/test/hash_float_test.hpp 2007-10-17 13:29:46 EDT (Wed, 17 Oct 2007)
@@ -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
Modified: trunk/libs/functional/hash/test/hash_global_namespace_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_global_namespace_test.cpp (original)
+++ trunk/libs/functional/hash/test/hash_global_namespace_test.cpp 2007-10-17 13:29:46 EDT (Wed, 17 Oct 2007)
@@ -44,7 +44,7 @@
# ifdef TEST_STD_INCLUDES
# include <functional>
# else
-# include <boost/functional/hash/hash.hpp>
+# include <boost/functional/hash.hpp>
# endif
#endif
Modified: trunk/libs/functional/hash/test/hash_map_test.hpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_map_test.hpp (original)
+++ trunk/libs/functional/hash/test/hash_map_test.hpp 2007-10-17 13:29:46 EDT (Wed, 17 Oct 2007)
@@ -8,6 +8,7 @@
#else
#include <boost/preprocessor/cat.hpp>
+
#if defined(BOOST_MSVC)
#pragma warning(push)
#pragma warning(disable:4245) // signed/unsigned mismatch
Modified: trunk/libs/functional/hash/test/hash_set_test.hpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_set_test.hpp (original)
+++ trunk/libs/functional/hash/test/hash_set_test.hpp 2007-10-17 13:29:46 EDT (Wed, 17 Oct 2007)
@@ -19,7 +19,7 @@
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 @@
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;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk