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

Commits on May 27, 2021

  1. Remove references to VS2017.

    pleroy committed May 27, 2021
    Copy the full SHA
    f2152ff View commit details
  2. Remove references to VS2017.

    pleroy committed May 27, 2021
    Copy the full SHA
    222caf0 View commit details
  3. Copy the full SHA
    02239b4 View commit details
  4. Copy the full SHA
    e90ea48 View commit details
  5. Copy the full SHA
    20251fe View commit details
  6. Merge pull request #3002 from pleroy/VS2017

    Remove references to VS2017
    pleroy authored May 27, 2021
    Copy the full SHA
    4d1b8d0 View commit details
Showing with 4 additions and 9 deletions.
  1. +2 −7 geometry/pair_test.cpp
  2. +2 −2 ksp_plugin/pile_up.hpp
9 changes: 2 additions & 7 deletions geometry/pair_test.cpp
Original file line number Diff line number Diff line change
@@ -118,13 +118,8 @@ TEST_F(PairTest, MemberSubtraction) {
3 * si::Unit<Amount>})),
pp_ - vv_);
EXPECT_EQ(PV(P1() + V1({3 * si::Unit<Action>,
2 * si::Unit<Action>,
3 * si::Unit<Action>}) +
// A convoluted way of writing {3, 3, 3}, to circumvent a
// frightening bug in VS2017.
V1({0 * si::Unit<Action>,
1 * si::Unit<Action>,
0 * si::Unit<Action> }),
3 * si::Unit<Action>,
3 * si::Unit<Action>}),
V2({0 * si::Unit<Amount>,
0 * si::Unit<Amount>,
0 * si::Unit<Amount>})),
4 changes: 2 additions & 2 deletions ksp_plugin/pile_up.hpp
Original file line number Diff line number Diff line change
@@ -123,10 +123,10 @@ class PileUp {
// Recomputes the state of motion of the pile-up based on that of its parts.
void RecomputeFromParts();

// We'd like to return |not_null<std::shared_ptr<PileUp> const&|, but the
// We'd like to return |not_null<std::shared_ptr<PileUp>> const&|, but the
// compiler gets confused when defining the corresponding lambda, and thinks
// that we return a local variable even though we capture by reference.
// TODO(phl): Try to fix in VS2017 or later.
// TODO(phl): Try to fix in VS2022 or later.
using PileUpForSerializationIndex =
std::function<not_null<std::shared_ptr<PileUp>>(int)>;
using SerializationIndexForPileUp =