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

Commits on Nov 15, 2020

  1. Copy the full SHA
    c7cbcf7 View commit details
  2. Typo.

    pleroy committed Nov 15, 2020
    Copy the full SHA
    214a8a0 View commit details
  3. Merge pull request #2785 from pleroy/16.8

    Upgrade to VS 16.8.1
    pleroy authored Nov 15, 2020
    Copy the full SHA
    f9519ec View commit details
Showing with 17 additions and 3 deletions.
  1. +3 −0 base/macros.hpp
  2. +2 −1 base/not_null_test.cpp
  3. +12 −2 numerics/polynomial_body.hpp
3 changes: 3 additions & 0 deletions base/macros.hpp
Original file line number Diff line number Diff line change
@@ -26,6 +26,9 @@ char const* const CompilerVersion = __VERSION__;
#define PRINCIPIA_COMPILER_MSVC 1
char const* const CompilerName = "Microsoft Visual C++";
char const* const CompilerVersion = STRINGIFY_EXPANSION(_MSC_FULL_VER);
# if _HAS_CXX20
# define PRINCIPIA_COMPILER_MSVC_HAS_CXX20 1
# endif
#elif defined(__ICC) || defined(__INTEL_COMPILER)
#define PRINCIPIA_COMPILER_ICC 1
char const* const CompilerName = "Intel C++ Compiler";
3 changes: 2 additions & 1 deletion base/not_null_test.cpp
Original file line number Diff line number Diff line change
@@ -69,7 +69,8 @@ TEST_F(NotNullTest, Move) {
_MSC_FULL_VER == 192'528'610 || \
_MSC_FULL_VER == 192'528'611 || \
_MSC_FULL_VER == 192'628'806 || \
_MSC_FULL_VER == 192'729'111)
_MSC_FULL_VER == 192'729'111 || \
_MSC_FULL_VER == 192'829'333)
EXPECT_THAT(*(std::unique_ptr<int> const&)int_ptr1, Eq(3));
#endif
not_null<std::unique_ptr<int>> int_ptr2 = std::move(int_ptr1);
14 changes: 12 additions & 2 deletions numerics/polynomial_body.hpp
Original file line number Diff line number Diff line change
@@ -101,6 +101,10 @@ struct PolynomialAtOrigin<Value, Argument, degree, Evaluator,
typename Polynomial::Coefficients const& coefficients,
Point<Argument> const& from_origin,
Point<Argument> const& to_origin);

#if PRINCIPIA_COMPILER_MSVC_HAS_CXX20
using PolynomialAlias = Polynomial;
#endif
};

template<typename Value, typename Argument, int degree,
@@ -109,9 +113,15 @@ template<typename Value, typename Argument, int degree,
auto PolynomialAtOrigin<Value, Argument, degree,
Evaluator,
std::index_sequence<indices...>>::
#if defined(PRINCIPIA_COMPILER_MSVC_HAS_CXX20)
MakePolynomial(typename PolynomialAlias::Coefficients const& coefficients,
Point<Argument> const& from_origin,
Point<Argument> const& to_origin) -> PolynomialAlias {
#else
MakePolynomial(typename Polynomial::Coefficients const& coefficients,
Point<Argument> const& from_origin,
Point<Argument> const& to_origin) -> Polynomial {
Point<Argument> const& from_origin,
Point<Argument> const& to_origin) -> Polynomial {
#endif
Argument const shift = to_origin - from_origin;
std::array<typename Polynomial::Coefficients, degree + 1> const
all_coefficients{