X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Flibs%2Fthread%2Ftest%2Fthreads%2Fthread%2Fconstr%2FF_pass.cpp;h=b99e90babf4363abe6916d9f18211d53b94dc229;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=e649f41dda35e61dfe654ddb0b3c5512bbb51981;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git diff --git a/ceph/src/boost/libs/thread/test/threads/thread/constr/F_pass.cpp b/ceph/src/boost/libs/thread/test/threads/thread/constr/F_pass.cpp index e649f41dd..b99e90bab 100644 --- a/ceph/src/boost/libs/thread/test/threads/thread/constr/F_pass.cpp +++ b/ceph/src/boost/libs/thread/test/threads/thread/constr/F_pass.cpp @@ -29,6 +29,8 @@ unsigned throw_one = 0xFFFF; void* operator new(std::size_t s) _GLIBCXX_THROW (std::bad_alloc) #elif defined BOOST_MSVC void* operator new(std::size_t s) +#elif __cplusplus > 201402L +void* operator new(std::size_t s) #else void* operator new(std::size_t s) throw (std::bad_alloc) #endif @@ -42,7 +44,7 @@ void* operator new(std::size_t s) throw (std::bad_alloc) #if defined BOOST_MSVC void operator delete(void* p) #else -void operator delete(void* p) throw () +void operator delete(void* p) BOOST_NOEXCEPT_OR_NOTHROW #endif { //std::cout << __FILE__ << ":" << __LINE__ << std::endl;