|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r77832 - in trunk: boost/functional/hash/detail boost/unordered/detail libs/functional/hash/test libs/unordered/test/exception libs/unordered/test/helpers libs/unordered/test/unordered
From: dnljms_at_[hidden]
Date: 2012-04-08 11:29:20
Author: danieljames
Date: 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
New Revision: 77832
URL: http://svn.boost.org/trac/boost/changeset/77832
Log:
Unordered/hash: Avoid a gcc warning. Refs #6771
Added:
trunk/libs/unordered/test/helpers/postfix.hpp (contents, props changed)
Text files modified:
trunk/boost/functional/hash/detail/hash_float.hpp | 16 +++++++++++++++-
trunk/boost/unordered/detail/table.hpp | 2 +-
trunk/libs/functional/hash/test/Jamfile.v2 | 4 ++--
trunk/libs/functional/hash/test/hash_complex_test.cpp | 4 ++++
trunk/libs/functional/hash/test/hash_float_test.hpp | 4 ++++
trunk/libs/functional/hash/test/hash_number_test.cpp | 4 ++++
trunk/libs/unordered/test/exception/assign_exception_tests.cpp | 2 --
trunk/libs/unordered/test/exception/constructor_exception_tests.cpp | 2 --
trunk/libs/unordered/test/exception/containers.hpp | 2 ++
trunk/libs/unordered/test/exception/copy_exception_tests.cpp | 2 --
trunk/libs/unordered/test/exception/erase_exception_tests.cpp | 2 --
trunk/libs/unordered/test/exception/insert_exception_tests.cpp | 2 --
trunk/libs/unordered/test/exception/rehash_exception_tests.cpp | 2 --
trunk/libs/unordered/test/exception/swap_exception_tests.cpp | 2 --
trunk/libs/unordered/test/unordered/Jamfile.v2 | 4 ++--
trunk/libs/unordered/test/unordered/assign_tests.cpp | 2 +-
trunk/libs/unordered/test/unordered/at_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/bucket_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/compile_map.cpp | 2 +-
trunk/libs/unordered/test/unordered/compile_set.cpp | 2 +-
trunk/libs/unordered/test/unordered/constructor_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/copy_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/equality_deprecated.cpp | 3 ++-
trunk/libs/unordered/test/unordered/equality_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/erase_equiv_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/erase_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/find_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/fwd_map_test.cpp | 2 +-
trunk/libs/unordered/test/unordered/fwd_set_test.cpp | 2 +-
trunk/libs/unordered/test/unordered/incomplete_test.cpp | 5 +++--
trunk/libs/unordered/test/unordered/insert_stable_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/insert_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/link_test_1.cpp | 2 +-
trunk/libs/unordered/test/unordered/link_test_2.cpp | 2 +-
trunk/libs/unordered/test/unordered/load_factor_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/move_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/rehash_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/simple_tests.cpp | 3 ++-
trunk/libs/unordered/test/unordered/swap_tests.cpp | 5 +++--
trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp | 6 ++++--
41 files changed, 83 insertions(+), 49 deletions(-)
Modified: trunk/boost/functional/hash/detail/hash_float.hpp
==============================================================================
--- trunk/boost/functional/hash/detail/hash_float.hpp (original)
+++ trunk/boost/functional/hash/detail/hash_float.hpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -87,9 +87,23 @@
namespace hash_detail
{
template <class T>
+ inline bool is_zero(T v)
+ {
+#if !defined(__GNUC__)
+ return v == 0;
+#else
+ // GCC's '-Wfloat-equal' will complain about comparing
+ // v to 0, but because it disables warnings for system
+ // headers it won't complain if you use std::equal_to to
+ // compare with 0. Resulting in this silliness:
+ return std::equal_to<T>()(v, 0);
+#endif
+ }
+
+ template <class T>
inline std::size_t float_hash_value(T v)
{
- return v == 0 ? 0 : float_hash_impl(v);
+ return boost::hash_detail::is_zero(v) ? 0 : float_hash_impl(v);
}
}
}
Modified: trunk/boost/unordered/detail/table.hpp
==============================================================================
--- trunk/boost/unordered/detail/table.hpp (original)
+++ trunk/boost/unordered/detail/table.hpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -391,7 +391,7 @@
std::size_t min_buckets_for_size(std::size_t size) const
{
- BOOST_ASSERT(this->mlf_ != 0);
+ BOOST_ASSERT(this->mlf_ >= minimum_max_load_factor);
using namespace std;
Modified: trunk/libs/functional/hash/test/Jamfile.v2
==============================================================================
--- trunk/libs/functional/hash/test/Jamfile.v2 (original)
+++ trunk/libs/functional/hash/test/Jamfile.v2 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -10,8 +10,8 @@
<warnings>all
<toolset>intel:<warnings>on
<toolset>intel:<cxxflags>-strict-ansi
- <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
- <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
+ <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal"
+ <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal"
<toolset>msvc:<warnings-as-errors>on
#<toolset>gcc:<warnings-as-errors>on
#<toolset>darwin:<warnings-as-errors>on
Modified: trunk/libs/functional/hash/test/hash_complex_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_complex_test.cpp (original)
+++ trunk/libs/functional/hash/test/hash_complex_test.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -35,6 +35,10 @@
#endif
#endif
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
#include <complex>
#include <sstream>
#include <boost/limits.hpp>
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 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -30,6 +30,10 @@
#endif
#endif
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
char const* float_type(float*) { return "float"; }
char const* float_type(double*) { return "double"; }
char const* float_type(long double*) { return "long double"; }
Modified: trunk/libs/functional/hash/test/hash_number_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_number_test.cpp (original)
+++ trunk/libs/functional/hash/test/hash_number_test.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -28,6 +28,10 @@
#pragma warning(disable:4310) // cast truncates constant value
#endif
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
template <class T>
void numeric_test(T*)
{
Modified: trunk/libs/unordered/test/exception/assign_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/assign_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/assign_exception_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -3,8 +3,6 @@
// 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)
-#include "../helpers/prefix.hpp"
-
#include "./containers.hpp"
#include "../helpers/random_values.hpp"
#include "../helpers/invariants.hpp"
Modified: trunk/libs/unordered/test/exception/constructor_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/constructor_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/constructor_exception_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -3,8 +3,6 @@
// 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)
-#include "../helpers/prefix.hpp"
-
#include "./containers.hpp"
#include "../helpers/random_values.hpp"
#include "../helpers/input_iterator.hpp"
Modified: trunk/libs/unordered/test/exception/containers.hpp
==============================================================================
--- trunk/libs/unordered/test/exception/containers.hpp (original)
+++ trunk/libs/unordered/test/exception/containers.hpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -3,8 +3,10 @@
// 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)
+#include "../helpers/prefix.hpp"
#include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp>
+#include "../helpers/postfix.hpp"
#include "../objects/exception.hpp"
typedef boost::unordered_set<
Modified: trunk/libs/unordered/test/exception/copy_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/copy_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/copy_exception_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -3,8 +3,6 @@
// 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)
-#include "../helpers/prefix.hpp"
-
#include "./containers.hpp"
#include "../helpers/random_values.hpp"
Modified: trunk/libs/unordered/test/exception/erase_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/erase_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/erase_exception_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -3,8 +3,6 @@
// 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)
-#include "../helpers/prefix.hpp"
-
#include "./containers.hpp"
#include "../helpers/random_values.hpp"
#include "../helpers/invariants.hpp"
Modified: trunk/libs/unordered/test/exception/insert_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/insert_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/insert_exception_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -3,8 +3,6 @@
// 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)
-#include "../helpers/prefix.hpp"
-
#include "./containers.hpp"
#include <string>
#include "../helpers/random_values.hpp"
Modified: trunk/libs/unordered/test/exception/rehash_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/rehash_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/rehash_exception_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -3,8 +3,6 @@
// 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)
-#include "../helpers/prefix.hpp"
-
#include "./containers.hpp"
#include <string>
#include "../helpers/random_values.hpp"
Modified: trunk/libs/unordered/test/exception/swap_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/swap_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/swap_exception_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -3,8 +3,6 @@
// 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)
-#include "../helpers/prefix.hpp"
-
#include "./containers.hpp"
#include "../helpers/random_values.hpp"
#include "../helpers/invariants.hpp"
Added: trunk/libs/unordered/test/helpers/postfix.hpp
==============================================================================
--- (empty file)
+++ trunk/libs/unordered/test/helpers/postfix.hpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -0,0 +1,10 @@
+
+// Copyright 2012 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)
+
+// Include this after the boost headers, but before other test headers.
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
Modified: trunk/libs/unordered/test/unordered/Jamfile.v2
==============================================================================
--- trunk/libs/unordered/test/unordered/Jamfile.v2 (original)
+++ trunk/libs/unordered/test/unordered/Jamfile.v2 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -11,8 +11,8 @@
<toolset>intel:<warnings>on
# Would be nice to define -Wundef, but I'm getting warnings from
# Boost.Preprocessor on trunk.
- <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wno-long-long"
- <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
+ <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wno-long-long -Wfloat-equal"
+ <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal"
#<toolset>gcc:<define>_GLIBCXX_DEBUG
#<toolset>darwin:<define>_GLIBCXX_DEBUG
#<toolset>msvc:<warnings-as-errors>on
Modified: trunk/libs/unordered/test/unordered/assign_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/assign_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/assign_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,9 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
#include "../helpers/test.hpp"
#include "../objects/test.hpp"
#include "../objects/cxx11_allocator.hpp"
Modified: trunk/libs/unordered/test/unordered/at_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/at_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/at_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,8 +4,9 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include <string>
Modified: trunk/libs/unordered/test/unordered/bucket_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/bucket_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/bucket_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include <algorithm>
#include "../objects/test.hpp"
Modified: trunk/libs/unordered/test/unordered/compile_map.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/compile_map.cpp (original)
+++ trunk/libs/unordered/test/unordered/compile_map.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -7,8 +7,8 @@
// requirements. Makes sure everything compiles and is defined correctly.
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
#include <iostream>
#include "../helpers/test.hpp"
Modified: trunk/libs/unordered/test/unordered/compile_set.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/compile_set.cpp (original)
+++ trunk/libs/unordered/test/unordered/compile_set.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -7,8 +7,8 @@
// requirements. Makes sure everything compiles and is defined correctly.
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
+#include "../helpers/postfix.hpp"
#include <iostream>
#include "../helpers/test.hpp"
Modified: trunk/libs/unordered/test/unordered/constructor_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/constructor_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/constructor_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include "../objects/test.hpp"
#include "../helpers/random_values.hpp"
Modified: trunk/libs/unordered/test/unordered/copy_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/copy_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/copy_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include "../objects/test.hpp"
#include "../objects/cxx11_allocator.hpp"
Modified: trunk/libs/unordered/test/unordered/equality_deprecated.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/equality_deprecated.cpp (original)
+++ trunk/libs/unordered/test/unordered/equality_deprecated.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -6,9 +6,10 @@
#define BOOST_UNORDERED_DEPRECATED_EQUALITY
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include <boost/preprocessor/seq.hpp>
#include <list>
#include "../helpers/test.hpp"
Modified: trunk/libs/unordered/test/unordered/equality_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/equality_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/equality_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include <boost/preprocessor/seq.hpp>
#include <list>
#include "../helpers/test.hpp"
Modified: trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include <algorithm>
#include <map>
Modified: trunk/libs/unordered/test/unordered/erase_equiv_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/erase_equiv_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/erase_equiv_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -7,8 +7,9 @@
// hairy with several tricky edge cases - so explicitly test each one.
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include "../helpers/list.hpp"
#include <set>
Modified: trunk/libs/unordered/test/unordered/erase_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/erase_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/erase_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include <boost/next_prior.hpp>
#include "../objects/test.hpp"
Modified: trunk/libs/unordered/test/unordered/find_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/find_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/find_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include "../objects/test.hpp"
#include "../helpers/random_values.hpp"
Modified: trunk/libs/unordered/test/unordered/fwd_map_test.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/fwd_map_test.cpp (original)
+++ trunk/libs/unordered/test/unordered/fwd_map_test.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,8 +4,8 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered/unordered_map_fwd.hpp>
+#include "../helpers/postfix.hpp"
template <typename T>
void call_swap(boost::unordered_map<T,T>& x,
Modified: trunk/libs/unordered/test/unordered/fwd_set_test.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/fwd_set_test.cpp (original)
+++ trunk/libs/unordered/test/unordered/fwd_set_test.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,8 +4,8 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered/unordered_set_fwd.hpp>
+#include "../helpers/postfix.hpp"
struct true_type { char x[100]; };
struct false_type { char x; };
Modified: trunk/libs/unordered/test/unordered/incomplete_test.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/incomplete_test.cpp (original)
+++ trunk/libs/unordered/test/unordered/incomplete_test.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,10 +4,11 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
-#include <utility>
#include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp>
+#include "../helpers/postfix.hpp"
+
+#include <utility>
namespace x
{
Modified: trunk/libs/unordered/test/unordered/insert_stable_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/insert_stable_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/insert_stable_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include <iostream>
Modified: trunk/libs/unordered/test/unordered/insert_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/insert_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/insert_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include <boost/next_prior.hpp>
#include "../objects/test.hpp"
Modified: trunk/libs/unordered/test/unordered/link_test_1.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/link_test_1.cpp (original)
+++ trunk/libs/unordered/test/unordered/link_test_1.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,9 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
void foo(boost::unordered_set<int>&,
boost::unordered_map<int, int>&,
Modified: trunk/libs/unordered/test/unordered/link_test_2.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/link_test_2.cpp (original)
+++ trunk/libs/unordered/test/unordered/link_test_2.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,9 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
void foo(boost::unordered_set<int>& x1,
boost::unordered_map<int, int>& x2,
Modified: trunk/libs/unordered/test/unordered/load_factor_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/load_factor_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/load_factor_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include <boost/limits.hpp>
#include "../helpers/random_values.hpp"
Modified: trunk/libs/unordered/test/unordered/move_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/move_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/move_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or move at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include "../objects/test.hpp"
#include "../objects/cxx11_allocator.hpp"
Modified: trunk/libs/unordered/test/unordered/rehash_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/rehash_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/rehash_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,9 +4,10 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include "../helpers/random_values.hpp"
#include "../helpers/tracker.hpp"
Modified: trunk/libs/unordered/test/unordered/simple_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/simple_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/simple_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -6,9 +6,10 @@
// This test checks the runtime requirements of containers.
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
#include "../helpers/test.hpp"
#include <cstdlib>
#include <algorithm>
Modified: trunk/libs/unordered/test/unordered/swap_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/swap_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/swap_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -4,12 +4,13 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "../helpers/prefix.hpp"
+#include <boost/unordered_set.hpp>
+#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
#include <boost/config.hpp>
#include <algorithm>
#include <iterator>
-#include <boost/unordered_set.hpp>
-#include <boost/unordered_map.hpp>
#include "../helpers/test.hpp"
#include "../objects/test.hpp"
#include "../objects/cxx11_allocator.hpp"
Modified: trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp 2012-04-08 11:29:15 EDT (Sun, 08 Apr 2012)
@@ -1,12 +1,14 @@
-#include <iostream>
+
// Copyright 2006-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)
#include "../helpers/prefix.hpp"
-
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+
+#include <iostream>
#include "../helpers/test.hpp"
#if defined(BOOST_UNORDERED_VARIADIC_MOVE)
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