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

Commits on Aug 22, 2020

  1. Comment out the test.

    pleroy committed Aug 22, 2020
    Copy the full SHA
    68dc3f0 View commit details
  2. Merge pull request #2689 from pleroy/Clang

    Comment out a test
    pleroy authored Aug 22, 2020
    Copy the full SHA
    6521bef View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −1 mathematica/mathematica_test.cpp
  2. +1 −1 numerics/poisson_series.hpp
3 changes: 2 additions & 1 deletion mathematica/mathematica_test.cpp
Original file line number Diff line number Diff line change
@@ -343,11 +343,12 @@ TEST_F(MathematicaTest, ToMathematica) {
"2]]]",
ToMathematica(polynomial2));
}
#if !PRINCIPIA_COMPILER_MSVC
#if 0
// This test does not compile with MSVC 16.6.3: it thinks that operators + and
// - on polynomials are ambiguous deep in the constructor of PoissonSeries.
// But don't despair, because the exact same code compiled in a different
// place (frequency_analysis_test.cpp) works like a charm...
// With Clang it doesn't because it misses the body of ToMathematica.
{
using Series = PoissonSeries<double, 0, HornerEvaluator>;
Instant const t0 = Instant() + 3 * Second;
2 changes: 1 addition & 1 deletion numerics/poisson_series.hpp
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ FORWARD_DECLARE_FUNCTION_FROM(
mathematica,
TEMPLATE(typename Value, int degree_,
template<typename, typename, int> class Evaluator,
typename OptionalExpressIn= std::nullopt_t) std::string,
typename OptionalExpressIn = std::nullopt_t) std::string,
ToMathematica,
(numerics::PoissonSeries<Value, degree_, Evaluator> const& series,
OptionalExpressIn express_in = std::nullopt));