Release 1.49.0 beta 1

[SVN r76721]

include/boost/unordered/detail/allocator_helpers.hpp

@@ -26,10 +26,6 @@
 #include <boost/assert.hpp>
 #include <boost/utility/addressof.hpp>
 
-#if !defined(BOOST_UNORDERED_USE_ALLOCATOR_TRAITS)
-#define BOOST_UNORDERED_USE_ALLOCATOR_TRAITS 0
-#endif
-
 #if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS
 #  include <memory>
 #endif
@@ -202,8 +198,7 @@ namespace boost { namespace unordered { namespace detail {
     template <typename Alloc, typename T>
     struct rebind_wrap
     {
-        typedef typename std::allocator_traits<Alloc>::
-            template rebind_alloc<T> type;
+        typedef typename std::allocator_traits<Alloc>::rebind_alloc<T> type;
     };
 
 #else

include/boost/unordered/detail/extract_key.hpp

@@ -51,6 +51,13 @@ namespace detail {
             return v;
         }
 
+#if BOOST_UNORDERED_USE_RV_REF
+        static key_type const& extract(BOOST_RV_REF(key_type) v)
+        {
+            return v;
+        }
+#endif
+
         static no_key extract()
         {
             return no_key();
@@ -62,6 +69,7 @@ namespace detail {
         {
             return no_key();
         }
+
 #else
         template <class Arg>
         static no_key extract(Arg const&)
@@ -98,6 +106,13 @@ namespace detail {
             return v;
         }
 
+        // TODO: Why does this cause errors?
+        //
+        //static key_type const& extract(BOOST_RV_REF(key_type) v)
+        //{
+        //    return v;
+        //}
+
         template <class Second>
         static key_type const& extract(std::pair<key_type, Second> const& v)
         {

test/helpers/invariants.hpp

@@ -38,7 +38,7 @@ namespace test
             it = x1.begin(), end = x1.end();
         BOOST_DEDUCED_TYPENAME X::size_type size = 0;
         while(it != end) {
-            // First test that the current key has not occurred before, required
+            // First test that the current key has not occured before, required
             // to test either that keys are unique or that equivalent keys are
             // adjacent. (6.3.1/6)
             key_type key = get_key<X>(*it);

test/objects/minimal.hpp

@@ -333,7 +333,7 @@ namespace minimal
         typedef std::size_t size_type;
         typedef std::ptrdiff_t difference_type;
         typedef void_ptr void_pointer;
-        typedef void_const_ptr const_void_pointer;
+        typedef void_const_ptr void_const_pointer;
         typedef ptr<T> pointer;
         typedef const_ptr<T> const_pointer;
         typedef T& reference;

test/unordered/Jamfile.v2

@@ -9,8 +9,6 @@ project unordered-test/unordered
     : requirements
         <warnings>all
         <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:<define>_GLIBCXX_DEBUG

test/unordered/allocator_traits.cpp

@@ -90,12 +90,7 @@ void test_empty_allocator()
 {
     typedef empty_allocator<int> allocator;
     typedef boost::unordered::detail::allocator_traits<allocator> traits;
-#if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS
-    BOOST_MPL_ASSERT((boost::is_same<traits::size_type,
-        std::make_unsigned<std::ptrdiff_t>::type>));
-#else
     BOOST_MPL_ASSERT((boost::is_same<traits::size_type, std::size_t>));
-#endif
     BOOST_MPL_ASSERT((boost::is_same<traits::difference_type, std::ptrdiff_t>));
     BOOST_MPL_ASSERT((boost::is_same<traits::pointer, int*>));
     BOOST_MPL_ASSERT((boost::is_same<traits::const_pointer, int const*>));
@@ -128,12 +123,7 @@ void test_allocator1()
 {
     typedef allocator1<int> allocator;
     typedef boost::unordered::detail::allocator_traits<allocator> traits;
-#if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS
-    BOOST_MPL_ASSERT((boost::is_same<typename traits::size_type,
-        std::make_unsigned<std::ptrdiff_t>::type>));
-#else
     BOOST_MPL_ASSERT((boost::is_same<traits::size_type, std::size_t>));
-#endif
     BOOST_MPL_ASSERT((boost::is_same<traits::difference_type, std::ptrdiff_t>));
     BOOST_MPL_ASSERT((boost::is_same<traits::pointer, int*>));
     BOOST_MPL_ASSERT((boost::is_same<traits::const_pointer, int const*>));
@@ -196,20 +186,6 @@ struct ptr
     T& operator*() const { return *value_; }
 };
 
-template <>
-struct ptr<void>
-{
-    void* value_;
-    ptr(void* v) : value_(v) {}
-};
-
-template <>
-struct ptr<const void>
-{
-    void const* value_;
-    ptr(void const* v) : value_(v) {}
-};
-
 template <typename T>
 struct allocator3
 {

test/unordered/compile_tests.hpp

@@ -22,7 +22,6 @@
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/iterator/iterator_traits.hpp>
 #include <boost/limits.hpp>
-#include <boost/utility/swap.hpp>
 #include "../helpers/check_return_type.hpp"
 
 typedef long double comparison_type;

test/unordered/minimal_allocator.cpp

@@ -51,13 +51,7 @@ void test_simple_allocator()
     //BOOST_MPL_ASSERT((boost::is_same<typename traits::const_void_pointer, void const*>));
 
     BOOST_MPL_ASSERT((boost::is_same<typename traits::difference_type, std::ptrdiff_t>));
-
-#if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS
-    BOOST_MPL_ASSERT((boost::is_same<typename traits::size_type,
-        std::make_unsigned<std::ptrdiff_t>::type>));
-#else
     BOOST_MPL_ASSERT((boost::is_same<typename traits::size_type, std::size_t>));
-#endif
 
     BOOST_TEST(!traits::propagate_on_container_copy_assignment::value);
     BOOST_TEST(!traits::propagate_on_container_move_assignment::value);