update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / variant / detail / visitation_impl.hpp

diff --git a/ceph/src/boost/boost/variant/detail/visitation_impl.hpp b/ceph/src/boost/boost/variant/detail/visitation_impl.hpp
index 69b7a2b4ff2ca9447ea1d80567c94d87d13187bb..8c318ac95a638b43b45464520344ebc45ae227c3 100644 (file)
--- a/ceph/src/boost/boost/variant/detail/visitation_impl.hpp
+++ b/ceph/src/boost/boost/variant/detail/visitation_impl.hpp
@@ -34,9 +34,9 @@
 #include <boost/type_traits/has_nothrow_copy.hpp>
 #include <boost/type_traits/is_nothrow_move_constructible.hpp>
 
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) 
-# pragma warning (push) 
-# pragma warning (disable : 4702) //unreachable code 
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+# pragma warning (push)
+# pragma warning (disable : 4702) //unreachable code
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -58,6 +58,13 @@
 
 #endif
 
+// Define a compiler generic null pointer value
+#if defined(BOOST_NO_NULLPTR)
+#define BOOST_VARIANT_NULL 0
+#else
+#define BOOST_VARIANT_NULL nullptr
+#endif
+
 namespace boost {
 namespace detail { namespace variant {
 
@@ -177,7 +184,7 @@ inline typename Visitor::result_type
 visitation_impl(
       int, int, Visitor&, VPCV
     , mpl::true_ // is_apply_visitor_unrolled
-    , NBF, W* = 0, S* = 0
+    , NBF, W* = BOOST_VARIANT_NULL, S* = BOOST_VARIANT_NULL
     )
 {
     // should never be here at runtime!
@@ -196,7 +203,7 @@ visitation_impl(
     , Visitor& visitor, VoidPtrCV storage
     , mpl::false_ // is_apply_visitor_unrolled
     , NoBackupFlag no_backup_flag
-    , Which* = 0, step0* = 0
+    , Which* = BOOST_VARIANT_NULL, step0* = BOOST_VARIANT_NULL
     )
 {
     // Typedef apply_visitor_unrolled steps and associated types...
@@ -263,8 +270,8 @@ visitation_impl(
 }} // namespace detail::variant
 } // namespace boost
 
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)  
-# pragma warning(pop)  
-#endif 
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+# pragma warning(pop)
+#endif
 
 #endif // BOOST_VARIANT_DETAIL_VISITATION_IMPL_HPP