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

Commits on May 25, 2017

  1. Assignment is hard. Let's go shopping.

    @pleroy
    pleroy committed May 25, 2017
    Copy the full SHA
    2a2929b View commit details

  2. Merge pull request #1398 from pleroy/Equality 

    Assignment is hard.  Let's go shopping.
    @pleroy
    pleroy authored May 25, 2017
    Copy the full SHA
    3b71a8f View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 physics/forkable_body.hpp
2 changes: 1 addition & 1 deletion physics/forkable_body.hpp
View file
Original file line number Diff line number Diff line change
@@ -233,7 +233,7 @@ It3rator Forkable<Tr4jectory, It3rator>::LowerBound(Instant const& time) const {
// |time| is after the end of this timeline or after the |fork_point|
// (if any). We may have to return an |End| iterator, so let's prepare
// |iterator.current_| for that case.
iterator.current_ == ancestor->timeline_end();
iterator.current_ = ancestor->timeline_end();

// Check if we have a more nested fork with a point before |time|. Go
// down the ancestry looking for a timeline that is nonempty and not