X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Fboost%2Fmpl%2Fassert.hpp;h=7f220941a310451fcaeb33a488e995857ede6e45;hb=92f5a8d42d07f9929ae4fa7e01342fe8d96808a8;hp=1af1b0587e1e0a12ca85d353e53c10da5ce25dfd;hpb=a0324939f9d0e1905d5df8f57442f09dc70af83d;p=ceph.git
diff --git a/ceph/src/boost/boost/mpl/assert.hpp b/ceph/src/boost/boost/mpl/assert.hpp
index 1af1b0587..7f220941a 100644
--- a/ceph/src/boost/boost/mpl/assert.hpp
+++ b/ceph/src/boost/boost/mpl/assert.hpp
@@ -184,16 +184,27 @@ template< typename P > struct assert_arg_pred_not
typedef typename assert_arg_pred_impl
::type type;
};
+#if defined(BOOST_GCC) && BOOST_GCC >= 80000
+#define BOOST_MPL_IGNORE_PARENTHESES_WARNING
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wparentheses"
+#endif
+
template< typename Pred >
-failed ************ (Pred::************
+failed ************ (Pred::************
assert_arg( void (*)(Pred), typename assert_arg_pred::type )
);
template< typename Pred >
-failed ************ (boost::mpl::not_::************
+failed ************ (boost::mpl::not_::************
assert_not_arg( void (*)(Pred), typename assert_arg_pred_not::type )
);
+#ifdef BOOST_MPL_IGNORE_PARENTHESES_WARNING
+#undef BOOST_MPL_IGNORE_PARENTHESES_WARNING
+#pragma GCC diagnostic pop
+#endif
+
template< typename Pred >
AUX778076_ASSERT_ARG(assert)
assert_arg( void (*)(Pred), typename assert_arg_pred_not::type );
@@ -432,8 +443,17 @@ BOOST_MPL_AUX_ASSERT_CONSTANT( \
/**/
#endif
-#define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \
+#if 0
+// Work around BOOST_MPL_ASSERT_MSG_IMPL generating multiple definition linker errors on VC++8.
+// #if defined(BOOST_MSVC) && BOOST_MSVC < 1500
+# include
+# define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \
+BOOST_STATIC_ASSERT_MSG( c, #msg ) \
+/**/
+#else
+# define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \
BOOST_MPL_ASSERT_MSG_IMPL( BOOST_MPL_AUX_PP_COUNTER(), c, msg, types_ ) \
/**/
+#endif
#endif // BOOST_MPL_ASSERT_HPP_INCLUDED