update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / variant / get.hpp

diff --git a/ceph/src/boost/boost/variant/get.hpp b/ceph/src/boost/boost/variant/get.hpp
index 0130bff358b93e01419bbe1f823c9b6cb297e189..b74e9ccf24ea45ff9a819ad9a077ac3049332a0a 100644 (file)
--- a/ceph/src/boost/boost/variant/get.hpp
+++ b/ceph/src/boost/boost/variant/get.hpp
@@ -4,7 +4,7 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 2003 Eric Friedman, Itay Maman
-// Copyright (c) 2014-2019 Antony Polukhin
+// Copyright (c) 2014-2020 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -102,8 +102,13 @@ public: // visitor interfaces
 #   if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0551))
 #       define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t)
 #   else
-#       define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t)  \
-        , t* = 0
+#       if defined(BOOST_NO_NULLPTR)
+#           define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t)  \
+            , t* = 0
+#       else
+#           define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t)  \
+            , t* = nullptr
+#       endif
 #   endif
 #endif