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

Commits on Dec 14, 2019

  1. Fix a Clang compilation error.

    pleroy committed Dec 14, 2019
    Copy the full SHA
    e009b31 View commit details
  2. Merge pull request #2407 from pleroy/Clang

    Fix a Clang compilation error
    pleroy authored Dec 14, 2019
    Copy the full SHA
    adc1b05 View commit details
Showing with 10 additions and 10 deletions.
  1. +10 −10 integrators/integrators_body.hpp
20 changes: 10 additions & 10 deletions integrators/integrators_body.hpp
Original file line number Diff line number Diff line change
@@ -156,11 +156,11 @@ ReadSlmsInstanceFromMessage(
<< message.DebugString();
auto const& extension = message.GetExtension(
serialization::SymmetricLinearMultistepIntegratorInstance::extension);
return typename Integrator::Instance::ReadFromMessage(extension,
problem,
append_state,
step,
integrator);
return Integrator::Instance::ReadFromMessage(extension,
problem,
append_state,
step,
integrator);
}

template<typename Integrator>
@@ -176,11 +176,11 @@ ReadSrknInstanceFromMessage(
<< message.DebugString();
auto const& extension = message.GetExtension(
serialization::SymplecticRungeKuttaNystromIntegratorInstance::extension);
return typename Integrator::Instance::ReadFromMessage(extension,
problem,
append_state,
step,
integrator);
return Integrator::Instance::ReadFromMessage(extension,
problem,
append_state,
step,
integrator);
}

// We do not deserialize an SPRK per se, but only when it is converted to an