Merge unordered changes.

[SVN r58802]
2010-01-08 05:39:54 +00:00
parent f962857e68
commit aa0e8eedd2
42 changed files with 761 additions and 360 deletions
--- a/test/unordered/simple_tests.cpp
+++ b/test/unordered/simple_tests.cpp
@@ -72,7 +72,8 @@ void simple_test(X const& a)

    {
        BOOST_TEST(a.size() ==
-                (BOOST_DEDUCED_TYPENAME X::size_type) std::distance(a.begin(), a.end()));
+            static_cast<BOOST_DEDUCED_TYPENAME X::size_type>(
+                std::distance(a.begin(), a.end())));
    }

    {