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

Commits on Jan 3, 2020

  1. Copy the full SHA
    a32c78c View commit details
  2. Merge pull request #2432 from pleroy/Template

    Add the word template to a few places to fix Clang errors
    pleroy authored Jan 3, 2020
    Copy the full SHA
    4350bb8 View commit details
4 changes: 2 additions & 2 deletions ksp_plugin/manœuvre_body.hpp
Original file line number Diff line number Diff line change
@@ -253,8 +253,8 @@ Manœuvre<InertialFrame, Frame>::ComputeFrenetFrame(
RigidMotion<Frame, InertialFrame> const from_frame_at_t =
to_frame_at_t.Inverse();
return from_frame_at_t.orthogonal_map() *
frame()->FrenetFrame(t, to_frame_at_t(degrees_of_freedom)).
Forget<OrthogonalMap>();
frame()->FrenetFrame(t, to_frame_at_t(degrees_of_freedom))
.template Forget<OrthogonalMap>();
}

template<typename InertialFrame, typename Frame>
2 changes: 1 addition & 1 deletion physics/barycentric_rotating_dynamic_frame_body.hpp
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ BarycentricRotatingDynamicFrame<InertialFrame, ThisFrame>::ToThisFrameAtTime(
RigidTransformation<InertialFrame, ThisFrame> const
rigid_transformation(barycentre_degrees_of_freedom.position(),
ThisFrame::origin,
rotation.Forget<OrthogonalMap>());
rotation.template Forget<OrthogonalMap>());
return RigidMotion<InertialFrame, ThisFrame>(
rigid_transformation,
angular_velocity,
2 changes: 1 addition & 1 deletion physics/body_centred_body_direction_dynamic_frame_body.hpp
Original file line number Diff line number Diff line change
@@ -112,7 +112,7 @@ BodyCentredBodyDirectionDynamicFrame<InertialFrame, ThisFrame>::
RigidTransformation<InertialFrame, ThisFrame> const
rigid_transformation(primary_degrees_of_freedom.position(),
ThisFrame::origin,
rotation.Forget<OrthogonalMap>());
rotation.template Forget<OrthogonalMap>());
return RigidMotion<InertialFrame, ThisFrame>(
rigid_transformation,
angular_velocity,
6 changes: 3 additions & 3 deletions physics/body_centred_non_rotating_dynamic_frame_body.hpp
Original file line number Diff line number Diff line change
@@ -31,8 +31,7 @@ BodyCentredNonRotatingDynamicFrame(
auto const rotating_body =
dynamic_cast<RotatingBody<InertialFrame> const*>(&*centre_);
if (rotating_body == nullptr) {
return Identity<InertialFrame, ThisFrame>().
Forget<OrthogonalMap>();
return OrthogonalMap<InertialFrame, ThisFrame>::Identity();
}
// In coordinates, the third parameter is |polar_axis|, but we seem
// to be a bit confused as to which of these things should be
@@ -42,7 +41,8 @@ BodyCentredNonRotatingDynamicFrame(
rotating_body->equatorial(),
rotating_body->biequatorial(),
Wedge(rotating_body->equatorial(),
rotating_body->biequatorial())).Forget<OrthogonalMap>();
rotating_body->biequatorial()))
.template Forget<OrthogonalMap>();
}()) {}

template<typename InertialFrame, typename ThisFrame>
2 changes: 1 addition & 1 deletion physics/body_surface_dynamic_frame_body.hpp
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ BodySurfaceDynamicFrame<InertialFrame, ThisFrame>::ToThisFrameAtTime(
RigidTransformation<InertialFrame, ThisFrame> const
rigid_transformation(centre_degrees_of_freedom.position(),
ThisFrame::origin,
rotation.Forget<OrthogonalMap>());
rotation.template Forget<OrthogonalMap>());
return RigidMotion<InertialFrame, ThisFrame>(
rigid_transformation,
angular_velocity,
2 changes: 1 addition & 1 deletion physics/rigid_motion_body.hpp
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ RigidMotion<FromFrame, ToFrame>::MakeNonRotatingMotion(
geometry::Permutation<FromFrame, ToFrame>(
geometry::Permutation<FromFrame,
ToFrame>::CoordinatePermutation::XZY)
.Forget<OrthogonalMap>()),
.template Forget<OrthogonalMap>()),
ToFrame::nonrotating,
degrees_of_freedom_of_from_frame_origin.velocity());
}