Import latest changes to the unordered containers. Includes:

Copyright update. Switch back to the version where the sentinel points to itself. Remove alternative versions of swap. Workaround a borland bug or two. More consistent use of class/swap/template. Avoid a few warnings. Add a no-throw swap to the allocator for exception testing. [SVN r3793]
2007-03-18 20:00:59 +00:00
parent 8d31c94d9a
commit df1e1598a5
61 changed files with 334 additions and 354 deletions
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,5 +1,5 @@

-# Copyright 2006 Daniel James.
+# Copyright 2006-2007 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)

--- a/test/container/compile_tests.hpp
+++ b/test/container/compile_tests.hpp
@@ -1,5 +1,5 @@

-// Copyright 2005-2006 Daniel James.
+// Copyright 2005-2007 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)

--- a/test/container/link_test_1.cpp
+++ b/test/container/link_test_1.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/container/link_test_2.cpp
+++ b/test/container/link_test_2.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/container/map_compile.cpp
+++ b/test/container/map_compile.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/container/set_compile.cpp
+++ b/test/container/set_compile.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/container/simple_tests.cpp
+++ b/test/container/simple_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/exception/Jamfile.v2
+++ b/test/exception/Jamfile.v2
@@ -1,5 +1,5 @@

-# Copyright 2006 Daniel James.
+# Copyright 2006-2007 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)

@@ -22,9 +22,5 @@ test-suite unordered-tests
        [ run erase_tests.cpp framework ]
        [ run rehash_tests.cpp framework ]
        [ run swap_tests.cpp framework : : :
-            <define>BOOST_UNORDERED_SWAP_METHOD=1 : swap_tests1 ]
-        [ run swap_tests.cpp framework : : :
-            <define>BOOST_UNORDERED_SWAP_METHOD=2 : swap_tests2 ]
-        [ run swap_tests.cpp framework : : :
-            <define>BOOST_UNORDERED_SWAP_METHOD=3 : swap_tests3 ]
+            <define>BOOST_UNORDERED_SWAP_METHOD=3 ]
    ;
--- a/test/exception/assign_tests.cpp
+++ b/test/exception/assign_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/exception/constructor_tests.cpp
+++ b/test/exception/constructor_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/exception/containers.hpp
+++ b/test/exception/containers.hpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/exception/copy_tests.cpp
+++ b/test/exception/copy_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/exception/erase_tests.cpp
+++ b/test/exception/erase_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/exception/insert_tests.cpp
+++ b/test/exception/insert_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/exception/rehash_tests.cpp
+++ b/test/exception/rehash_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/exception/swap_tests.cpp
+++ b/test/exception/swap_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/helpers/check_return_type.hpp
+++ b/test/helpers/check_return_type.hpp
@@ -1,5 +1,5 @@

-// Copyright 2005-2006 Daniel James.
+// Copyright 2005-2007 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)

--- a/test/helpers/equivalent.hpp
+++ b/test/helpers/equivalent.hpp
@@ -1,5 +1,5 @@

-// Copyright 2005-2006 Daniel James.
+// Copyright 2005-2007 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)

--- a/test/helpers/fwd.hpp
+++ b/test/helpers/fwd.hpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/helpers/generators.hpp
+++ b/test/helpers/generators.hpp
@@ -1,5 +1,5 @@

-// Copyright 2005-2006 Daniel James.
+// Copyright 2005-2007 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)

--- a/test/helpers/helpers.hpp
+++ b/test/helpers/helpers.hpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/helpers/input_iterator.hpp
+++ b/test/helpers/input_iterator.hpp
@@ -1,5 +1,5 @@

-// Copyright 2005-2006 Daniel James.
+// Copyright 2005-2007 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)

--- a/test/helpers/invariants.hpp
+++ b/test/helpers/invariants.hpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/helpers/metafunctions.hpp
+++ b/test/helpers/metafunctions.hpp
@@ -1,5 +1,5 @@

-// Copyright 2005-2006 Daniel James.
+// Copyright 2005-2007 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)

--- a/test/helpers/random_values.hpp
+++ b/test/helpers/random_values.hpp
@@ -1,5 +1,5 @@

-// Copyright 2005-2006 Daniel James.
+// Copyright 2005-2007 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)

--- a/test/helpers/strong.hpp
+++ b/test/helpers/strong.hpp
@@ -1,5 +1,5 @@

-// Copyright 2005-2006 Daniel James.
+// Copyright 2005-2007 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)

--- a/test/helpers/tracker.hpp
+++ b/test/helpers/tracker.hpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/objects/exception.hpp
+++ b/test/objects/exception.hpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

@@ -661,6 +661,11 @@ namespace exception
            }
            return (std::numeric_limits<std::size_t>::max)();
        }
+
+        friend void swap(allocator<T>& x, allocator<T>& y)
+        {
+            std::swap(x.tag_, y.tag_);
+        }
    };

    // It's pretty much impossible to write a compliant swap when these
--- a/test/objects/fwd.hpp
+++ b/test/objects/fwd.hpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/objects/minimal.hpp
+++ b/test/objects/minimal.hpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

@@ -46,7 +46,7 @@ namespace minimal
    class hash
    {
    public:
-        static hash create() { return hash(); }
+        static hash create() { return hash<T>(); }
        hash() {}
        hash(hash const&) {}
        hash& operator=(hash const&) { return *this; }
@@ -59,13 +59,13 @@ namespace minimal
    class equal_to
    {
    public:
-        static equal_to create() { return equal_to(); }
+        static equal_to create() { return equal_to<T>(); }
        equal_to() {}
        equal_to(equal_to const&) {}
        equal_to& operator=(equal_to const&) { return *this; }
        ~equal_to() {}

-        bool operator()(T const& x, T const& y) const { return true; }
+        bool operator()(T const&, T const&) const { return true; }
    };

    template <class T> class pointer;
@@ -90,7 +90,7 @@ namespace minimal
        T* operator->() const { return ptr_; }
        pointer& operator++() { ++ptr_; return *this; }
        pointer operator++(int) { pointer tmp(*this); ++ptr_; return tmp; }
-        pointer operator+(int s) const { return pointer(ptr_ + s); }
+        pointer operator+(int s) const { return pointer<T>(ptr_ + s); }
        T& operator[](int s) const { return ptr_[s]; }
        bool operator!() const { return !ptr_; }

--- a/test/objects/test.hpp
+++ b/test/objects/test.hpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/Jamfile.v2
+++ b/test/unordered/Jamfile.v2
@@ -1,5 +1,5 @@

-# Copyright 2006 Daniel James.
+# Copyright 2006-2007 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)

@@ -25,7 +25,5 @@ test-suite unordered-tests
        [ run bucket_tests.cpp ]
        [ run load_factor_tests.cpp ]
        [ run rehash_tests.cpp ]
-        [ run swap_tests.cpp : : : <define>BOOST_UNORDERED_SWAP_METHOD=1 : swap_tests1 ]
-        [ run swap_tests.cpp : : : <define>BOOST_UNORDERED_SWAP_METHOD=2 : swap_tests2 ]
-        [ run swap_tests.cpp : : : <define>BOOST_UNORDERED_SWAP_METHOD=3 : swap_tests3 ]
+        [ run swap_tests.cpp : : : <define>BOOST_UNORDERED_SWAP_METHOD=3 ]
    ;
--- a/test/unordered/assign_tests.cpp
+++ b/test/unordered/assign_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/bucket_tests.cpp
+++ b/test/unordered/bucket_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/compile_tests.cpp
+++ b/test/unordered/compile_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

@@ -18,7 +18,7 @@
 template <class T> void sink(T const&) {}

 template <class X, class Key>
-void unordered_set_test(X& r, Key const& k)
+void unordered_set_test(X&, Key const&)
 {
    typedef typename X::value_type value_type;
    typedef typename X::key_type key_type;
@@ -27,7 +27,7 @@ void unordered_set_test(X& r, Key const& k)
 }

 template <class X, class Key, class T>
-void unordered_map_test(X& r, Key const& k, T const& t)
+void unordered_map_test(X&, Key const&, T const&)
 {
    typedef typename X::value_type value_type;
    typedef typename X::key_type key_type;
@@ -49,7 +49,7 @@ void unordered_equivalent_test(X& r, T const& t)
 }

 template <class X, class Key, class T, class Hash, class Pred>
-void unordered_test(X& ref, Key& k, T& t, Hash& hf, Pred& eq)
+void unordered_test(X&, Key& k, T& t, Hash& hf, Pred& eq)
 {
    typedef typename X::key_type key_type;
    typedef typename X::hasher hasher;
--- a/test/unordered/constructor_tests.cpp
+++ b/test/unordered/constructor_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/copy_tests.cpp
+++ b/test/unordered/copy_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/equivalent_keys_tests.cpp
+++ b/test/unordered/equivalent_keys_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/erase_equiv_tests.cpp
+++ b/test/unordered/erase_equiv_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/erase_tests.cpp
+++ b/test/unordered/erase_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/find_tests.cpp
+++ b/test/unordered/find_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/insert_tests.cpp
+++ b/test/unordered/insert_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/load_factor_tests.cpp
+++ b/test/unordered/load_factor_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/rehash_tests.cpp
+++ b/test/unordered/rehash_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/swap_tests.cpp
+++ b/test/unordered/swap_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)

--- a/test/unordered/unnecessary_copy_tests.cpp
+++ b/test/unordered/unnecessary_copy_tests.cpp
@@ -1,5 +1,5 @@

-// Copyright 2006 Daniel James.
+// Copyright 2006-2007 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)