Skip to content

Commit

Permalink
Merge pull request #2023 from eggrobin/mac-build
Browse files Browse the repository at this point in the history
Make it build on mac
eggrobin authored Dec 8, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents d682ca4 + e46d3b4 commit 3e2334a
Showing 3 changed files with 2 additions and 7 deletions.
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(

0 comments on commit 3e2334a

Please sign in to comment.