import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / libs / mp11 / test / mp_quote_trait.cpp

diff --git a/ceph/src/boost/libs/mp11/test/mp_quote_trait.cpp b/ceph/src/boost/libs/mp11/test/mp_quote_trait.cpp
index 75c84ea1e8e4cc3da57b791a90d04b7a2417e7be..ab52bb94998ceaf3cb8cc3769569edf8d1734232 100644 (file)
--- a/ceph/src/boost/libs/mp11/test/mp_quote_trait.cpp
+++ b/ceph/src/boost/libs/mp11/test/mp_quote_trait.cpp
@@ -8,6 +8,7 @@
 
 
 #include <boost/mp11/utility.hpp>
+#include <boost/mp11/detail/config.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
 #include <type_traits>
 
@@ -15,7 +16,7 @@ int main()
 {
     using boost::mp11::mp_identity;
     using boost::mp11::mp_quote_trait;
-    using boost::mp11::mp_invoke;
+    using boost::mp11::mp_invoke_q;
 
     {
         using Q = mp_quote_trait<mp_identity>;
@@ -23,8 +24,8 @@ int main()
         BOOST_TEST_TRAIT_TRUE((std::is_same<Q::fn<void>, void>));
         BOOST_TEST_TRAIT_TRUE((std::is_same<Q::fn<int[]>, int[]>));
 
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke<Q, void>, void>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke<Q, int[]>, int[]>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke_q<Q, void>, void>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke_q<Q, int[]>, int[]>));
     }
 
     {
@@ -33,8 +34,8 @@ int main()
         BOOST_TEST_TRAIT_TRUE((std::is_same<Q::fn<void>, void*>));
         BOOST_TEST_TRAIT_TRUE((std::is_same<Q::fn<int[]>, int(*)[]>));
 
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke<Q, void>, void*>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke<Q, int[]>, int(*)[]>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke_q<Q, void>, void*>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke_q<Q, int[]>, int(*)[]>));
     }
 
     {
@@ -43,12 +44,12 @@ int main()
         BOOST_TEST_TRAIT_TRUE((std::is_same<Q::fn<void>, void const>));
         BOOST_TEST_TRAIT_TRUE((std::is_same<Q::fn<int[]>, int const[]>));
 
-#if !BOOST_WORKAROUND( BOOST_GCC, < 40900 )
+#if !BOOST_MP11_WORKAROUND( BOOST_MP11_GCC, < 40900 )
 
         // g++ 4.7, 4.8 have difficulties with preserving top-level const
 
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke<Q, void>, void const>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke<Q, int[]>, int const[]>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke_q<Q, void>, void const>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_invoke_q<Q, int[]>, int const[]>));
 
 #endif
     }