[Boost-commit] svn:boost r78303 - in branches/release: . boost boost/xpressive boost/xpressive/traits

Subject: [Boost-commit] svn:boost r78303 - in branches/release: . boost boost/xpressive boost/xpressive/traits
From: eric_at_[hidden]
Date: 2012-05-02 03:04:56

Author: eric_niebler
Date: 2012-05-02 03:04:56 EDT (Wed, 02 May 2012)
New Revision: 78303
URL: http://svn.boost.org/trac/boost/changeset/78303

Log:
merge [78286] from trunk, fixes #6846
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/xpressive/   (props changed)
Text files modified: 
   branches/release/boost/xpressive/traits/cpp_regex_traits.hpp |     3 ++-                                     
   1 files changed, 2 insertions(+), 1 deletions(-)

Modified: branches/release/boost/xpressive/traits/cpp_regex_traits.hpp
==============================================================================
--- branches/release/boost/xpressive/traits/cpp_regex_traits.hpp	(original)
+++ branches/release/boost/xpressive/traits/cpp_regex_traits.hpp	2012-05-02 03:04:56 EDT (Wed, 02 May 2012)
@@ -24,6 +24,7 @@
 #include <boost/assert.hpp>
 #include <boost/integer.hpp>
 #include <boost/mpl/assert.hpp>
+#include <boost/static_assert.hpp>
 #include <boost/detail/workaround.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/xpressive/detail/detail_fwd.hpp>
@@ -89,7 +90,7 @@
     template<umaskex_t In, umaskex_t Out = highest_bit, bool Done = (0 == (Out & In))>
     struct unused_mask
     {
-        BOOST_MPL_ASSERT_RELATION(1, !=, Out);
+        BOOST_STATIC_ASSERT(1 != Out);
         BOOST_STATIC_CONSTANT(umaskex_t, value = (unused_mask<In, (Out >> 1)>::value));
     };