import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / concept_check / msvc.hpp

diff --git a/ceph/src/boost/boost/concept_check/msvc.hpp b/ceph/src/boost/boost/concept_check/msvc.hpp
index 3968469a89968c43153122d694439e9f697204ad..23f6b134782fefea3d5aeef7d4920fcdae484280 100644 (file)
--- a/ceph/src/boost/boost/concept_check/msvc.hpp
+++ b/ceph/src/boost/boost/concept_check/msvc.hpp
@@ -6,7 +6,7 @@
 
 # ifdef BOOST_OLD_CONCEPT_SUPPORT
 #  include <boost/concept_check/has_constraints.hpp>
-#  include <boost/mpl/if.hpp>
+#  include <boost/type_traits/conditional.hpp>
 # endif
 
 
@@ -40,7 +40,7 @@ namespace boost
 
   template <class Model>
   struct concept_check
-    : mpl::if_c<
+    : conditional<
           concept_checking::has_constraints<Model>::value
         , concept_checking::constraint_check<Model>
         , concept_checking::concept_check_<Model>