Subject: [Boost-commit] svn:boost r84442 - in branches/release: . boost boost/mpl libs libs/mpl/test
From: steven_at_[hidden]
Date: 2013-05-23 10:38:23
Author: steven_watanabe
Date: 2013-05-23 10:38:22 EDT (Thu, 23 May 2013)
New Revision: 84442
URL: http://svn.boost.org/trac/boost/changeset/84442
Log:
Merge [81027] from the trunk.
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/libs/ (props changed)
Text files modified:
branches/release/boost/mpl/assert.hpp | 70 +++++++++++++++++++++++++++++++++++++++
branches/release/libs/mpl/test/assert.cpp | 11 ++++++
2 files changed, 80 insertions(+), 1 deletions(-)
Modified: branches/release/boost/mpl/assert.hpp
==============================================================================
--- branches/release/boost/mpl/assert.hpp (original)
+++ branches/release/boost/mpl/assert.hpp 2013-05-23 10:38:22 EDT (Thu, 23 May 2013)
@@ -34,6 +34,9 @@
#include <boost/config.hpp> // make sure 'size_t' is placed into 'std'
#include <cstddef>
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1700)
+#include <boost/mpl/if.hpp>
+#endif
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
|| (BOOST_MPL_CFG_GCC != 0) \
@@ -131,8 +134,38 @@
#endif
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1700)
+
+template<class Pred>
+struct extract_assert_pred;
+
+template<class Pred>
+struct extract_assert_pred<void(Pred)> { typedef Pred type; };
+
+template<class Pred>
+struct eval_assert {
+ typedef typename extract_assert_pred<Pred>::type P;
+ typedef typename P::type p_type;
+ typedef typename ::boost::mpl::if_c<p_type::value,
+ AUX778076_ASSERT_ARG(assert<false>),
+ failed ************ P::************
+ >::type type;
+};
+
+template<class Pred>
+struct eval_assert_not {
+ typedef typename extract_assert_pred<Pred>::type P;
+ typedef typename P::type p_type;
+ typedef typename ::boost::mpl::if_c<!p_type::value,
+ AUX778076_ASSERT_ARG(assert<false>),
+ failed ************ ::boost::mpl::not_<P>::************
+ >::type type;
+};
+
+template< typename T >
+T make_assert_arg();
-#if !defined(BOOST_MPL_CFG_ASSERT_BROKEN_POINTER_TO_POINTER_TO_MEMBER)
+#elif !defined(BOOST_MPL_CFG_ASSERT_BROKEN_POINTER_TO_POINTER_TO_MEMBER)
template< bool > struct assert_arg_pred_impl { typedef int type; };
template<> struct assert_arg_pred_impl<true> { typedef void* type; };
@@ -211,6 +244,39 @@
BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1700)
+
+// BOOST_MPL_ASSERT((pred<x,...>))
+
+#define BOOST_MPL_ASSERT(pred) \
+BOOST_MPL_AUX_ASSERT_CONSTANT( \
+ std::size_t \
+ , BOOST_PP_CAT(mpl_assertion_in_line_,BOOST_MPL_AUX_PP_COUNTER()) = sizeof( \
+ boost::mpl::assertion_failed<false>( \
+ boost::mpl::make_assert_arg< \
+ typename boost::mpl::eval_assert<void pred>::type \
+ >() \
+ ) \
+ ) \
+ ) \
+/**/
+
+// BOOST_MPL_ASSERT_NOT((pred<x,...>))
+
+#define BOOST_MPL_ASSERT_NOT(pred) \
+BOOST_MPL_AUX_ASSERT_CONSTANT( \
+ std::size_t \
+ , BOOST_PP_CAT(mpl_assertion_in_line_,BOOST_MPL_AUX_PP_COUNTER()) = sizeof( \
+ boost::mpl::assertion_failed<false>( \
+ boost::mpl::make_assert_arg< \
+ typename boost::mpl::eval_assert_not<void pred>::type \
+ >() \
+ ) \
+ ) \
+ ) \
+/**/
+
+#else
// BOOST_MPL_ASSERT((pred<x,...>))
@@ -250,6 +316,8 @@
/**/
#endif
+#endif
+
// BOOST_MPL_ASSERT_RELATION(x, ==|!=|<=|<|>=|>, y)
#if defined(BOOST_MPL_CFG_ASSERT_USE_RELATION_NAMES)
Modified: branches/release/libs/mpl/test/assert.cpp
==============================================================================
--- branches/release/libs/mpl/test/assert.cpp (original)
+++ branches/release/libs/mpl/test/assert.cpp 2013-05-23 10:38:22 EDT (Thu, 23 May 2013)
@@ -71,6 +71,17 @@
}
};
+template<class T>
+struct nested : boost::mpl::true_ {
+ BOOST_MPL_ASSERT(( boost::is_pointer<T*> ));
+ BOOST_MPL_ASSERT_NOT(( boost::is_same<void,T> ));
+ BOOST_MPL_ASSERT_RELATION( sizeof(T*), >, 1 );
+ BOOST_MPL_ASSERT_MSG( true, GLOBAL_SCOPE_ERROR, (int,long) );
+};
+
+BOOST_MPL_ASSERT(( nested<int> ));
+BOOST_MPL_ASSERT_NOT(( boost::mpl::not_<nested<unsigned> > ));
+
int main()
{
her<void> h;