Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 85e7f634ac33
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b28f6ece9437
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 25, 2020

  1. Copy the full SHA
    1036ffe View commit details

Commits on Nov 26, 2020

  1. Merge pull request #2797 from pleroy/DefaultedStopToken

    Adhere to the semantics of stop_token::stop_requested
    pleroy authored Nov 26, 2020
    Copy the full SHA
    b28f6ec View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 base/jthread_body.hpp
2 changes: 1 addition & 1 deletion base/jthread_body.hpp
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ inline void StopState::Unregister(not_null<stop_callback*> const callback) {
}

inline bool stop_token::stop_requested() const {
return stop_state_->stop_requested();
return stop_state_ != nullptr && stop_state_->stop_requested();
}

inline stop_token::stop_token(not_null<StopState*> const stop_state)