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

Commits on Dec 8, 2018

  1. build errors on mac

    eggrobin committed Dec 8, 2018
    Copy the full SHA
    e46d3b4 View commit details
  2. Merge pull request #2023 from eggrobin/mac-build

    Make it build on mac
    eggrobin authored Dec 8, 2018
    Copy the full SHA
    3e2334a View commit details
Showing with 2 additions and 7 deletions.
  1. +0 −5 base/bundle.cpp
  2. +1 −1 integrators/integrators_body.hpp
  3. +1 −1 physics/ephemeris_body.hpp
5 changes: 0 additions & 5 deletions base/bundle.cpp
Original file line number Diff line number Diff line change
@@ -7,8 +7,6 @@
#include "base/map_util.hpp"
#include "base/status.hpp"

#if !OS_MACOSX

namespace principia {
namespace base {

@@ -125,6 +123,3 @@ bool Bundle::DeadlineExceeded() {

} // namespace base
} // namespace principia


#endif
2 changes: 1 addition & 1 deletion integrators/integrators_body.hpp
Original file line number Diff line number Diff line change
@@ -448,7 +448,7 @@ AdaptiveStepSizeIntegrator<ODE_>::ReadFromMessage(
serialization::AdaptiveStepSizeIntegrator const& message) {
return AdaptiveStepSizeIntegratorDeserializer<
typename ODE_::RightHandSideComputation>::
ReadFromMessage<AdaptiveStepSizeIntegrator<ODE_>>(message);
template ReadFromMessage<AdaptiveStepSizeIntegrator<ODE_>>(message);
}

template<typename Equation>
2 changes: 1 addition & 1 deletion physics/ephemeris_body.hpp
Original file line number Diff line number Diff line change
@@ -150,7 +150,7 @@ void Ephemeris<Frame>::ODEAdaptiveStepParameters<ODE>::WriteToMessage(

template<typename Frame>
template<typename ODE>
typename Ephemeris<Frame>::ODEAdaptiveStepParameters<ODE>
typename Ephemeris<Frame>::template ODEAdaptiveStepParameters<ODE>
Ephemeris<Frame>::ODEAdaptiveStepParameters<ODE>::ReadFromMessage(
serialization::Ephemeris::AdaptiveStepParameters const& message) {
return ODEAdaptiveStepParameters(