import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / context / fiber_winfib.hpp

diff --git a/ceph/src/boost/boost/context/fiber_winfib.hpp b/ceph/src/boost/boost/context/fiber_winfib.hpp
index cfd570a2e73c3eeb541d083251d926abb52494bb..f2612fd8e3f7cdccba566bfcf14572a46343dc4f 100644 (file)
--- a/ceph/src/boost/boost/context/fiber_winfib.hpp
+++ b/ceph/src/boost/boost/context/fiber_winfib.hpp
@@ -85,8 +85,7 @@ struct BOOST_CONTEXT_DECL fiber_activation_record {
 #else
         fiber = ::ConvertThreadToFiber( nullptr);
         if ( BOOST_UNLIKELY( nullptr == fiber) ) {
-            DWORD err = ::GetLastError();
-            BOOST_ASSERT( ERROR_ALREADY_FIBER == err);
+            BOOST_ASSERT( ERROR_ALREADY_FIBER == ::GetLastError());
             fiber = ::GetCurrentFiber(); 
             BOOST_ASSERT( nullptr != fiber);
             BOOST_ASSERT( reinterpret_cast< LPVOID >( 0x1E00) != fiber);
@@ -185,11 +184,20 @@ struct BOOST_CONTEXT_DECL fiber_activation_record_initializer {
 };
 
 struct forced_unwind {
-    fiber_activation_record  *   from{ nullptr };
+    fiber_activation_record  *  from{ nullptr };
+#ifndef BOOST_ASSERT_IS_VOID
+    bool                        caught{ false };
+#endif
 
     explicit forced_unwind( fiber_activation_record * from_) :
         from{ from_ } {
     }
+
+#ifndef BOOST_ASSERT_IS_VOID
+    ~forced_unwind() {
+        BOOST_ASSERT( caught);
+    }
+#endif
 };
 
 template< typename Ctx, typename StackAlloc, typename Fn >
@@ -230,6 +238,9 @@ public:
 #endif  
         } catch ( forced_unwind const& ex) {
             c = Ctx{ ex.from };
+#ifndef BOOST_ASSERT_IS_VOID
+            const_cast< forced_unwind & >( ex).caught = true;
+#endif
         }
         // this context has finished its task
         from = nullptr;
@@ -396,30 +407,10 @@ public:
         return nullptr == ptr_ || ptr_->terminated;
     }
 
-    bool operator==( fiber const& other) const noexcept {
-        return ptr_ == other.ptr_;
-    }
-
-    bool operator!=( fiber const& other) const noexcept {
-        return ptr_ != other.ptr_;
-    }
-
     bool operator<( fiber const& other) const noexcept {
         return ptr_ < other.ptr_;
     }
 
-    bool operator>( fiber const& other) const noexcept {
-        return other.ptr_ < ptr_;
-    }
-
-    bool operator<=( fiber const& other) const noexcept {
-        return ! ( * this > other);
-    }
-
-    bool operator>=( fiber const& other) const noexcept {
-        return ! ( * this < other);
-    }
-
     template< typename charT, class traitsT >
     friend std::basic_ostream< charT, traitsT > &
     operator<<( std::basic_ostream< charT, traitsT > & os, fiber const& other) {
@@ -440,6 +431,8 @@ void swap( fiber & l, fiber & r) noexcept {
     l.swap( r);
 }
 
+typedef fiber fiber_context;
+
 }}
 
 #if defined(BOOST_MSVC)