update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / libs / container / src / global_resource.cpp

diff --git a/ceph/src/boost/libs/container/src/global_resource.cpp b/ceph/src/boost/libs/container/src/global_resource.cpp
index 015531fa648914dfd61b2fd1e196c1ad43a3cf93..ca2dc68a5afa243495e1e5dbe20d5c8bc07cbbae 100644 (file)
--- a/ceph/src/boost/libs/container/src/global_resource.cpp
+++ b/ceph/src/boost/libs/container/src/global_resource.cpp
@@ -52,8 +52,12 @@ struct null_memory_resource_imp
    void* do_allocate(std::size_t bytes, std::size_t alignment) BOOST_OVERRIDE
    {
       (void)bytes; (void)alignment;
+      #if defined(BOOST_CONTAINER_USER_DEFINED_THROW_CALLBACKS) || defined(BOOST_NO_EXCEPTIONS)
       throw_bad_alloc();
       return 0;
+      #else
+      throw std::bad_alloc();
+      #endif
    }
 
    void do_deallocate(void* p, std::size_t bytes, std::size_t alignment) BOOST_OVERRIDE