Skip to content

Commit e4bce3e

Browse files
authored
Merge pull request #320 from mrmitzh/develop
Renamed forced_unwind struct to fiber_forced_unwind in fiber_ucontext
2 parents 6ff80e0 + f6445d5 commit e4bce3e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

include/boost/context/fiber_ucontext.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,10 @@ struct BOOST_CONTEXT_DECL fiber_activation_record_initializer {
241241
~fiber_activation_record_initializer();
242242
};
243243

244-
struct forced_unwind {
244+
struct fiber_forced_unwind {
245245
fiber_activation_record * from{ nullptr };
246246

247-
forced_unwind( fiber_activation_record * from_) noexcept :
247+
fiber_forced_unwind( fiber_activation_record * from_) noexcept :
248248
from{ from_ } {
249249
}
250250
};
@@ -290,7 +290,7 @@ class fiber_capture_record : public fiber_activation_record {
290290
#else
291291
c = std::invoke( fn_, std::move( c) );
292292
#endif
293-
} catch ( forced_unwind const& ex) {
293+
} catch ( fiber_forced_unwind const& ex) {
294294
c = Ctx{ ex.from };
295295
}
296296
// this context has finished its task
@@ -488,7 +488,7 @@ class BOOST_CONTEXT_DECL fiber {
488488
detail::fiber_activation_record * ptr = std::exchange( ptr_, nullptr)->resume();
489489
#endif
490490
if ( BOOST_UNLIKELY( detail::fiber_activation_record::current()->force_unwind) ) {
491-
throw detail::forced_unwind{ ptr};
491+
throw detail::fiber_forced_unwind{ ptr};
492492
} else if ( BOOST_UNLIKELY( nullptr != detail::fiber_activation_record::current()->ontop) ) {
493493
ptr = detail::fiber_activation_record::current()->ontop( ptr);
494494
detail::fiber_activation_record::current()->ontop = nullptr;
@@ -507,7 +507,7 @@ class BOOST_CONTEXT_DECL fiber {
507507
std::exchange( ptr_, nullptr)->resume_with< fiber >( std::forward< Fn >( fn) );
508508
#endif
509509
if ( BOOST_UNLIKELY( detail::fiber_activation_record::current()->force_unwind) ) {
510-
throw detail::forced_unwind{ ptr};
510+
throw detail::fiber_forced_unwind{ ptr};
511511
} else if ( BOOST_UNLIKELY( nullptr != detail::fiber_activation_record::current()->ontop) ) {
512512
ptr = detail::fiber_activation_record::current()->ontop( ptr);
513513
detail::fiber_activation_record::current()->ontop = nullptr;

0 commit comments

Comments
 (0)