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: 039b5e8f63ce
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3c6350c05b6c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 11, 2019

  1. Copy the full SHA
    cef97a6 View commit details
  2. Merge pull request #2161 from pleroy/2159

    Proper usage of the multiset container
    pleroy authored May 11, 2019
    Copy the full SHA
    3c6350c View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 physics/protector.cpp
4 changes: 3 additions & 1 deletion physics/protector.cpp
Original file line number Diff line number Diff line change
@@ -30,7 +30,9 @@ void Protector::Unprotect(Instant const& t_min) {
std::vector<Callback> callbacks_to_run;
{
absl::MutexLock l(&lock_);
CHECK_EQ(1, protection_start_times_.erase(t_min));
auto const it = protection_start_times_.find(t_min);
CHECK(it != protection_start_times_.end());
protection_start_times_.erase(it);

// Find all the callbacks that are now unprotected and remove them from the
// multimap.