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: 3ab9ab821b67
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e4d909151d03
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Dec 17, 2018

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e84ff04 View commit details

Commits on Dec 18, 2018

  1. Merge pull request #2030 from pleroy/15.9.4

    15.9.4 has the same bugs as 15.9.3
    eggrobin authored Dec 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e4d9091 View commit details
Showing with 14 additions and 7 deletions.
  1. +2 −1 base/base32768_body.hpp
  2. +2 −1 base/base32768_test.cpp
  3. +2 −1 base/not_null_test.cpp
  4. +2 −1 benchmarks/encoder.cpp
  5. +6 −3 ksp_plugin_test/manœuvre_test.cpp
3 changes: 2 additions & 1 deletion base/base32768_body.hpp
Original file line number Diff line number Diff line change
@@ -158,7 +158,8 @@ constexpr auto fifteen_bits = MakeRepertoire<block_size>(
#if !PRINCIPIA_COMPILER_MSVC || \
!(_MSC_FULL_VER == 191526608 || \
_MSC_FULL_VER == 191526731 || \
_MSC_FULL_VER == 191627024)
_MSC_FULL_VER == 191627024 || \
_MSC_FULL_VER == 191627025)
u"ᖀᖠᗀᗠᘀᘠᙀᚠᛀកᠠᡀᣀᦀ᧠ᨠᯀᰀᴀ⇠⋀⍀⍠⎀⎠⏀␀─┠╀╠▀"
u"■◀◠☀☠♀♠⚀⚠⛀⛠✀✠❀➀➠⠀⠠⡀⡠⢀⢠⣀⣠⤀⤠⥀⥠⦠⨠⩀⪀"
u"⪠⫠⬀⬠⭀ⰀⲀⲠⳀⴀⵀ⺠⻀㇀㐀㐠㑀㑠㒀㒠㓀㓠㔀㔠㕀㕠㖀㖠㗀㗠㘀㘠"
3 changes: 2 additions & 1 deletion base/base32768_test.cpp
Original file line number Diff line number Diff line change
@@ -81,7 +81,8 @@ using Base32768DeathTest = Base32768Test;
#if !PRINCIPIA_COMPILER_MSVC || \
!(_MSC_FULL_VER == 191526608 || \
_MSC_FULL_VER == 191526731 || \
_MSC_FULL_VER == 191627024)
_MSC_FULL_VER == 191627024 || \
_MSC_FULL_VER == 191627025)
TEST_F(Base32768Test, EncodeMultipleOf15Bits) {
// First 15 bytes of the MD5 of the empty string.
Array<std::uint8_t const> const binary("\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04"
3 changes: 2 additions & 1 deletion base/not_null_test.cpp
Original file line number Diff line number Diff line change
@@ -56,7 +56,8 @@ TEST_F(NotNullTest, Move) {
_MSC_FULL_VER == 191426429 || \
_MSC_FULL_VER == 191526608 || \
_MSC_FULL_VER == 191526731 || \
_MSC_FULL_VER == 191627024)
_MSC_FULL_VER == 191627024 || \
_MSC_FULL_VER == 191627025)
EXPECT_THAT(*(std::unique_ptr<int> const&)int_ptr1, Eq(3));
#endif
not_null<std::unique_ptr<int>> int_ptr2 = std::move(int_ptr1);
3 changes: 2 additions & 1 deletion benchmarks/encoder.cpp
Original file line number Diff line number Diff line change
@@ -104,7 +104,8 @@ BENCHMARK_TEMPLATE(BM_Decode, Encoder64);
#if !PRINCIPIA_COMPILER_MSVC || \
!(_MSC_FULL_VER == 191526608 || \
_MSC_FULL_VER == 191526731 || \
_MSC_FULL_VER == 191627024)
_MSC_FULL_VER == 191627024 || \
_MSC_FULL_VER == 191627025)
BENCHMARK_TEMPLATE(BM_Encode, Encoder32768);
BENCHMARK_TEMPLATE(BM_Decode, Encoder32768);
#endif
9 changes: 6 additions & 3 deletions ksp_plugin_test/manœuvre_test.cpp
Original file line number Diff line number Diff line change
@@ -104,7 +104,8 @@ TEST_F(ManœuvreTest, TimedBurn) {
EXPECT_EQ(1 * Newton, manœuvre.thrust());
EXPECT_EQ(2 * Kilogram, manœuvre.initial_mass());
EXPECT_EQ(1 * Metre / Second, manœuvre.specific_impulse());
#if PRINCIPIA_COMPILER_MSVC && _MSC_FULL_VER == 191627024
#if PRINCIPIA_COMPILER_MSVC && (_MSC_FULL_VER == 191627024 || \
_MSC_FULL_VER == 191627025)
EXPECT_TRUE(e_y == manœuvre.direction());
#else
EXPECT_EQ(e_y, manœuvre.direction());
@@ -160,7 +161,8 @@ TEST_F(ManœuvreTest, TargetΔv) {
EXPECT_EQ(1 * Newton, manœuvre.thrust());
EXPECT_EQ(2 * Kilogram, manœuvre.initial_mass());
EXPECT_EQ(1 * Metre / Second, manœuvre.specific_impulse());
#if PRINCIPIA_COMPILER_MSVC && _MSC_FULL_VER == 191627024
#if PRINCIPIA_COMPILER_MSVC && (_MSC_FULL_VER == 191627024 || \
_MSC_FULL_VER == 191627025)
EXPECT_TRUE(e_y == manœuvre.direction());
#else
EXPECT_EQ(e_y, manœuvre.direction());
@@ -372,7 +374,8 @@ TEST_F(ManœuvreTest, Serialization) {
EXPECT_EQ(1 * Newton, manœuvre_read.thrust());
EXPECT_EQ(2 * Kilogram, manœuvre_read.initial_mass());
EXPECT_EQ(1 * Metre / Second, manœuvre_read.specific_impulse());
#if PRINCIPIA_COMPILER_MSVC && _MSC_FULL_VER == 191627024
#if PRINCIPIA_COMPILER_MSVC && (_MSC_FULL_VER == 191627024 || \
_MSC_FULL_VER == 191627025)
EXPECT_TRUE(e_y == manœuvre.direction());
#else
EXPECT_EQ(e_y, manœuvre.direction());