import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / libs / ptr_container / test / ptr_unordered_set.cpp

diff --git a/ceph/src/boost/libs/ptr_container/test/ptr_unordered_set.cpp b/ceph/src/boost/libs/ptr_container/test/ptr_unordered_set.cpp
index a349eb95e4906f58c09e77fdcf55758ef3b913e1..9c21005b7e4a1bf41d808a0454d55bb2ae989a4c 100644 (file)
--- a/ceph/src/boost/libs/ptr_container/test/ptr_unordered_set.cpp
+++ b/ceph/src/boost/libs/ptr_container/test/ptr_unordered_set.cpp
@@ -124,7 +124,7 @@ void test_set()
 #ifndef BOOST_NO_AUTO_PTR
     BOOST_CHECK_THROW( (set.replace(set.begin(), std::auto_ptr<int>(0) )), bad_ptr_container_operation );
 #endif
-#ifndef BOOST_NO_CXX11_SMART_PTR
+#if !defined(BOOST_NO_CXX11_SMART_PTR) && !defined(BOOST_NO_CXX11_NULLPTR)
     BOOST_CHECK_THROW( (set.replace(set.begin(), std::unique_ptr<int>(nullptr) )), bad_ptr_container_operation );
 #endif