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

Commits on Aug 21, 2021

  1. Compiler version.

    pleroy committed Aug 21, 2021
    Copy the full SHA
    b0d02f7 View commit details
  2. Reset logging.

    pleroy committed Aug 21, 2021
    Copy the full SHA
    78bcf64 View commit details
  3. const

    pleroy committed Aug 21, 2021
    Copy the full SHA
    3122f1c View commit details
  4. Merge pull request #3106 from pleroy/Cleanup2

    Cleanup logging and a new compiler in the pipelines
    pleroy authored Aug 21, 2021
    Copy the full SHA
    4436361 View commit details
Showing with 12 additions and 3 deletions.
  1. +2 −1 base/not_null_test.cpp
  2. +8 −1 ksp_plugin_test/plugin_compatibility_test.cpp
  3. +2 −1 numerics/polynomial.hpp
3 changes: 2 additions & 1 deletion base/not_null_test.cpp
Original file line number Diff line number Diff line change
@@ -74,7 +74,8 @@ TEST_F(NotNullTest, Move) {
_MSC_FULL_VER == 192'829'337 || \
_MSC_FULL_VER == 192'930'036 || \
_MSC_FULL_VER == 192'930'037 || \
_MSC_FULL_VER == 192'930'038)
_MSC_FULL_VER == 192'930'038 || \
_MSC_FULL_VER == 192'930'133)
EXPECT_THAT(*(std::unique_ptr<int> const&)int_ptr1, Eq(3));
#endif
not_null<std::unique_ptr<int>> int_ptr2 = std::move(int_ptr1);
9 changes: 8 additions & 1 deletion ksp_plugin_test/plugin_compatibility_test.cpp
Original file line number Diff line number Diff line change
@@ -84,10 +84,15 @@ class StringLogSink : google::LogSink {

class PluginCompatibilityTest : public testing::Test {
protected:
PluginCompatibilityTest() {
PluginCompatibilityTest()
: stderrthreshold_(FLAGS_stderrthreshold) {
google::SetStderrLogging(google::WARNING);
}

~PluginCompatibilityTest() override {
google::SetStderrLogging(stderrthreshold_);
}

// Reads a plugin from a file containing only the "serialized_plugin = "
// lines, with "serialized_plugin = " dropped.
static not_null<std::unique_ptr<Plugin const>> ReadPluginFromFile(
@@ -171,6 +176,8 @@ class PluginCompatibilityTest : public testing::Test {

WriteAndReadBack(std::move(plugin));
}

int const stderrthreshold_;
};

TEST_F(PluginCompatibilityTest, PreCartan) {
3 changes: 2 additions & 1 deletion numerics/polynomial.hpp
Original file line number Diff line number Diff line change
@@ -23,7 +23,8 @@
#define PRINCIPIA_COMPILER_MSVC_HANDLES_POLYNOMIAL_OPERATORS \
!PRINCIPIA_COMPILER_MSVC || !(_MSC_FULL_VER == 192'930'036 || \
_MSC_FULL_VER == 192'930'037 || \
_MSC_FULL_VER == 192'930'038)
_MSC_FULL_VER == 192'930'038 || \
_MSC_FULL_VER == 192'930'133)

namespace principia {
namespace numerics {