Unordered/Hash: Merge from trunk.

[SVN r78319]
2012-05-03 22:05:21 +00:00
parent fa3d93ddbc
commit a8cd8cdd0b
50 changed files with 862 additions and 625 deletions
--- a/test/unordered/minimal_allocator.cpp
+++ b/test/unordered/minimal_allocator.cpp
@@ -52,7 +52,7 @@ void test_simple_allocator()

    BOOST_MPL_ASSERT((boost::is_same<typename traits::difference_type, std::ptrdiff_t>));

-#if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS
+#if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS == 1
    BOOST_MPL_ASSERT((boost::is_same<typename traits::size_type,
        std::make_unsigned<std::ptrdiff_t>::type>));
 #else