import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / contract / detail / operation / public_function.hpp

diff --git a/ceph/src/boost/boost/contract/detail/operation/public_function.hpp b/ceph/src/boost/boost/contract/detail/operation/public_function.hpp
index 6392e4ddbe154ddb304b009b3e26fa514159cd19..03eb07866ee42b5d03fa74d3ef7beac948af29be 100644 (file)
--- a/ceph/src/boost/boost/contract/detail/operation/public_function.hpp
+++ b/ceph/src/boost/boost/contract/detail/operation/public_function.hpp
@@ -10,9 +10,10 @@
 #include <boost/contract/core/virtual.hpp>
 #include <boost/contract/core/exception.hpp>
 #include <boost/contract/core/config.hpp>
+#include <boost/contract/core/virtual.hpp>
 #include <boost/contract/detail/condition/cond_subcontracting.hpp>
 #include <boost/contract/detail/tvariadic.hpp>
-#include <boost/contract/core/virtual.hpp>
+#include <boost/contract/detail/exception.hpp>
 #if     !defined(BOOST_CONTRACT_ALL_DISABLE_NO_ASSERTION) && ( \
         !defined(BOOST_CONTRACT_NO_INVARIANTS) || \
         !defined(BOOST_CONTRACT_NO_PRECONDITIONS) || \
@@ -113,7 +114,7 @@ private:
                 #ifndef BOOST_CONTRACT_NO_EXIT_INVARIANTS
                     this->check_subcontracted_exit_inv();
                 #endif
-                if(std::uncaught_exception()) {
+                if(uncaught_exception()) {
                     #ifndef BOOST_CONTRACT_NO_EXCEPTS
                         this->check_subcontracted_except();
                     #endif
@@ -141,7 +142,7 @@ public:
                 #ifndef BOOST_CONTRACT_NO_EXIT_INVARIANTS
                     this->check_subcontracted_exit_inv();
                 #endif
-                if(std::uncaught_exception()) {
+                if(uncaught_exception()) {
                     #ifndef BOOST_CONTRACT_NO_EXCEPTS
                         this->check_subcontracted_except();
                     #endif