import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / fiber / condition_variable.hpp

diff --git a/ceph/src/boost/boost/fiber/condition_variable.hpp b/ceph/src/boost/boost/fiber/condition_variable.hpp
index 53d6252fb175fd9e7e19b02d53b8059e17c3f2f0..769aeafc20b72d5fe9375c99de2791058626cc6b 100644 (file)
--- a/ceph/src/boost/boost/fiber/condition_variable.hpp
+++ b/ceph/src/boost/boost/fiber/condition_variable.hpp
@@ -15,6 +15,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
+#include <boost/context/detail/config.hpp>
 
 #include <boost/fiber/context.hpp>
 #include <boost/fiber/detail/config.hpp>
@@ -78,6 +79,10 @@ public:
         // relock external again before returning
         try {
             lt.lock();
+#if defined(BOOST_CONTEXT_HAS_CXXABI_H)
+        } catch ( abi::__forced_unwind const&) {
+            throw;
+#endif
         } catch (...) {
             std::terminate();
         }
@@ -118,6 +123,10 @@ public:
         // relock external again before returning
         try {
             lt.lock();
+#if defined(BOOST_CONTEXT_HAS_CXXABI_H)
+        } catch ( abi::__forced_unwind const&) {
+            throw;
+#endif
         } catch (...) {
             std::terminate();
         }