[Boost-commit] svn:boost r78341 - in branches/release: . boost boost/variant boost/variant/detail libs libs/variant/test

Subject: [Boost-commit] svn:boost r78341 - in branches/release: . boost boost/variant boost/variant/detail libs libs/variant/test
From: steven_at_[hidden]
Date: 2012-05-05 17:22:36

Author: steven_watanabe
Date: 2012-05-05 17:22:36 EDT (Sat, 05 May 2012)
New Revision: 78341
URL: http://svn.boost.org/trac/boost/changeset/78341

Log:
Merge Variant from the trunk.
Added:
   branches/release/boost/variant/detail/hash_variant.hpp
      - copied unchanged from r75606, /trunk/boost/variant/detail/hash_variant.hpp
   branches/release/libs/variant/test/hash_variant_test.cpp
      - copied unchanged from r75606, /trunk/libs/variant/test/hash_variant_test.cpp
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/variant/   (props changed)
   branches/release/libs/   (props changed)
Text files modified: 
   branches/release/boost/variant/detail/visitation_impl.hpp |     2 +-                                      
   branches/release/boost/variant/variant.hpp                |     1 +                                       
   branches/release/libs/variant/test/Jamfile.v2             |     1 +                                       
   3 files changed, 3 insertions(+), 1 deletions(-)

Modified: branches/release/boost/variant/detail/visitation_impl.hpp
==============================================================================
--- branches/release/boost/variant/detail/visitation_impl.hpp	(original)
+++ branches/release/boost/variant/detail/visitation_impl.hpp	2012-05-05 17:22:36 EDT (Sat, 05 May 2012)
@@ -261,7 +261,7 @@
 
 #   undef BOOST_VARIANT_AUX_APPLY_VISITOR_STEP_CASE
 
-    default: BOOST_ASSERT(!"Boost.Variant internal error: 'which' out of range.");
+    default: break;
     }
 
     // If not handled in this iteration, continue unrolling:

Modified: branches/release/boost/variant/variant.hpp
==============================================================================
--- branches/release/boost/variant/variant.hpp	(original)
+++ branches/release/boost/variant/variant.hpp	2012-05-05 17:22:36 EDT (Sat, 05 May 2012)
@@ -32,6 +32,7 @@
 #include "boost/variant/detail/make_variant_list.hpp"
 #include "boost/variant/detail/over_sequence.hpp"
 #include "boost/variant/detail/visitation_impl.hpp"
+#include "boost/variant/detail/hash_variant.hpp"
 
 #include "boost/variant/detail/generic_result_type.hpp"
 #include "boost/variant/detail/has_nothrow_move.hpp"

Modified: branches/release/libs/variant/test/Jamfile.v2
==============================================================================
--- branches/release/libs/variant/test/Jamfile.v2	(original)
+++ branches/release/libs/variant/test/Jamfile.v2	2012-05-05 17:22:36 EDT (Sat, 05 May 2012)
@@ -32,6 +32,7 @@
     [ run variant_reference_test.cpp ]
     [ run variant_comparison_test.cpp ]
     [ run variant_visit_test.cpp ]
+    [ run hash_variant_test.cpp ]
    ;