Subject: [Boost-commit] svn:boost r78286 - trunk/boost/xpressive/traits
From: eric_at_[hidden]
Date: 2012-05-01 02:13:49
Author: eric_niebler
Date: 2012-05-01 02:13:48 EDT (Tue, 01 May 2012)
New Revision: 78286
URL: http://svn.boost.org/trac/boost/changeset/78286
Log:
replace MPL assert with static assert since it's problematic in C++11, refs #6846
Text files modified:
trunk/boost/xpressive/traits/cpp_regex_traits.hpp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Modified: trunk/boost/xpressive/traits/cpp_regex_traits.hpp
==============================================================================
--- trunk/boost/xpressive/traits/cpp_regex_traits.hpp (original)
+++ trunk/boost/xpressive/traits/cpp_regex_traits.hpp 2012-05-01 02:13:48 EDT (Tue, 01 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));
};