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

Commits on Jan 13, 2018

  1. Explicit shared_ptr cast.

    @pleroy
    pleroy committed Jan 13, 2018
    Copy the full SHA
    2126caf View commit details

  2. The right cast.

    @pleroy
    pleroy committed Jan 13, 2018
    Copy the full SHA
    87c7e27 View commit details

  3. Merge pull request #1680 from pleroy/SharedPtr 

    Explicit shared_ptr cast
    @pleroy
    pleroy authored Jan 13, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6039cbb View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 ksp_plugin/part.cpp
2 changes: 1 addition & 1 deletion ksp_plugin/part.cpp
View file
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ void Part::set_containing_pile_up(
CHECK(!is_piled_up());
LOG(INFO) << "Adding part " << ShortDebugString() << " to the pile up at "
<< pile_up;
containing_pile_up_ = pile_up;
containing_pile_up_ = static_cast<std::shared_ptr<PileUp> const&>(pile_up);
}

PileUp* Part::containing_pile_up() const {