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

Commits on Jan 14, 2020

  1. Fix more Clang warnings.

    pleroy committed Jan 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    806d5b1 View commit details

Commits on Jan 15, 2020

  1. Clang and MSVC disagree.

    pleroy committed Jan 15, 2020
    Copy the full SHA
    33260d3 View commit details
  2. Merge pull request #2446 from pleroy/Warnings

    Fix more Clang warnings
    pleroy authored Jan 15, 2020
    Copy the full SHA
    eb9a98d View commit details
2 changes: 0 additions & 2 deletions astronomy/lunar_eclipse_test.cpp
Original file line number Diff line number Diff line change
@@ -99,7 +99,6 @@ class LunarEclipseTest : public ::testing::Test {
auto const umbral_half_aperture = [earth, moon, sun](
Instant const& t) {
auto const q_sun = ephemeris_->trajectory(sun)->EvaluatePosition(t);
auto const q_moon = ephemeris_->trajectory(moon)->EvaluatePosition(t);
auto const q_earth = ephemeris_->trajectory(earth)->EvaluatePosition(t);
return ArcSin((r_sun_ - (r_earth_ + atmospheric_depth_)) /
(q_sun - q_earth).Norm());
@@ -161,7 +160,6 @@ class LunarEclipseTest : public ::testing::Test {
auto const penumbral_half_aperture = [earth, moon, sun](
Instant const& t) {
auto const q_sun = ephemeris_->trajectory(sun)->EvaluatePosition(t);
auto const q_moon = ephemeris_->trajectory(moon)->EvaluatePosition(t);
auto const q_earth = ephemeris_->trajectory(earth)->EvaluatePosition(t);
return ArcSin((r_sun_ + r_earth_ + atmospheric_depth_) /
(q_sun - q_earth).Norm());
2 changes: 1 addition & 1 deletion astronomy/lunar_orbit_test.cpp
Original file line number Diff line number Diff line change
@@ -148,7 +148,7 @@ std::ostream& operator<<(std::ostream& o, GeopotentialTruncation truncation) {
class LunarOrbitTest : public ::testing::TestWithParam<GeopotentialTruncation> {
protected:
LunarOrbitTest()
: solar_system_2000_([this]() {
: solar_system_2000_([]() {
SolarSystem<ICRS> result(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
8 changes: 4 additions & 4 deletions astronomy/trappist_dynamics_test.cpp
Original file line number Diff line number Diff line change
@@ -266,12 +266,12 @@ Population::Population(Genome const& luca,
ComputeFitness compute_fitness,
std::mt19937_64& engine,
OFStream& file)
: current_(size, luca),
next_(size, luca),
compute_fitness_(std::move(compute_fitness)),
: compute_fitness_(std::move(compute_fitness)),
elitism_(elitism),
engine_(engine),
file_(file) {
file_(file),
current_(size, luca),
next_(size, luca) {
for (int i = 0; i < current_.size(); ++i) {
current_[i].Mutate(engine_, /*generation=*/-1);
}
2 changes: 1 addition & 1 deletion base/array_test.cpp
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ TEST(ArrayTest, Return) {

// This test only compiles if the constructor correctly uses |std::forward|.
TEST(ArrayTest, Move) {
auto fn =
[[maybe_unused]] auto fn =
[](std::unique_ptr<int> x,
std::unique_ptr<int> y) -> BoundedArray<std::unique_ptr<int>, 3> {
return {std::move(x), std::move(y)};
4 changes: 2 additions & 2 deletions base/not_null_test.cpp
Original file line number Diff line number Diff line change
@@ -173,7 +173,7 @@ TEST_F(NotNullTest, DynamicCast) {
class Derived : public Base {};
{
not_null<Base*> b = new Derived;
not_null<Derived*> d = dynamic_cast_not_null<Derived*>(b);
[[maybe_unused]] not_null<Derived*> d = dynamic_cast_not_null<Derived*>(b);
delete b;
}
{
@@ -228,7 +228,7 @@ TEST_F(NotNullTest, RValue) {
owner_int = make_not_null_unique<int>(1729);

not_null<int*> not_null_access_int = owner_int.get();
int const* access_const_int = not_null_access_int;
[[maybe_unused]] int const* access_const_int = not_null_access_int;

not_null<std::shared_ptr<int>> not_null_shared_int = std::make_shared<int>(3);
// This exercises |operator OtherPointer() const&|. The conversion from
1 change: 0 additions & 1 deletion base/push_deserializer_test.cpp
Original file line number Diff line number Diff line change
@@ -236,7 +236,6 @@ TEST_F(PushDeserializerTest, DeserializationGipfeli) {
number_of_chunks,
google::compression::NewGipfeliCompressor());
auto const written_trajectory = BuildTrajectory();
int const byte_size = written_trajectory->ByteSize();
auto const uncompressed = written_trajectory->SerializePartialAsString();

auto read_trajectory = make_not_null_unique<DiscreteTrajectory>();
6 changes: 3 additions & 3 deletions base/status_or_test.cpp
Original file line number Diff line number Diff line change
@@ -47,21 +47,21 @@ class Base1 {
public:
virtual ~Base1() = default;
private:
int pad;
[[maybe_unused]] int pad;
};

class Base2 {
public:
virtual ~Base2() = default;
private:
int yetotherpad;
[[maybe_unused]] int yetotherpad;
};

class Derived : public Base1, public Base2 {
public:
~Derived() override = default;
private:
int evenmorepad;
[[maybe_unused]] int evenmorepad;
};

TEST(StatusOr, TestDefaultCtor) {
6 changes: 3 additions & 3 deletions geometry/grassmann_test.cpp
Original file line number Diff line number Diff line change
@@ -276,19 +276,19 @@ TEST_F(GrassmannDeathTest, SerializationError) {
serialization::Multivector message;
V const v({-1 * Metre, 2 * Metre, 3 * Metre});
v.WriteToMessage(&message);
B const b = B::ReadFromMessage(message);
[[maybe_unused]] B const b = B::ReadFromMessage(message);
}, "has_bivector");
EXPECT_DEATH({
serialization::Multivector message;
B const b({-1 * Metre, 2 * Metre, 3 * Metre});
b.WriteToMessage(&message);
T const t = T::ReadFromMessage(message);
[[maybe_unused]] T const t = T::ReadFromMessage(message);
}, "has_trivector");
EXPECT_DEATH({
serialization::Multivector message;
T const t(1 * Metre);
t.WriteToMessage(&message);
V const v = V::ReadFromMessage(message);
[[maybe_unused]] V const v = V::ReadFromMessage(message);
}, "has_vector");
}

6 changes: 4 additions & 2 deletions geometry/point_test.cpp
Original file line number Diff line number Diff line change
@@ -101,15 +101,17 @@ TEST_F(PointDeathTest, SerializationError) {
Instant const t0;
Instant const t1 = t0 + 10 * Second;
t1.WriteToMessage(&message);
Position<World> const d2 = Position<World>::ReadFromMessage(message);
[[maybe_unused]] Position<World> const d2 =
Position<World>::ReadFromMessage(message);
}, "has_multivector");
EXPECT_DEATH({
serialization::Point message;
Position<World> const origin;
Position<World> const d1 = origin +
Displacement<World>({-1 * Metre, 2 * Metre, 3 * Metre});
d1.WriteToMessage(&message);
Instant const t2 = Instant::ReadFromMessage(message);
[[maybe_unused]] Instant const t2 =
Instant::ReadFromMessage(message);
}, "has_scalar");
}

1 change: 0 additions & 1 deletion geometry/symmetric_bilinear_form_body.hpp
Original file line number Diff line number Diff line change
@@ -121,7 +121,6 @@ SymmetricBilinearForm<Scalar, Frame>::Diagonalize() const {
R3x3Matrix<Scalar> const A_minus_α₂I = A - α₂ * I;
auto const m₀ = A_minus_α₁I * A_minus_α₂I;
auto const m₁ = A_minus_α₂I * A_minus_α₀I;
auto const m₂ = A_minus_α₀I * A_minus_α₁I;
auto const v₀ = Vector<double, Frame>(PickEigenvector(m₀));
auto const v₁ = Vector<double, Frame>(PickEigenvector(m₁));

1 change: 0 additions & 1 deletion geometry/symmetric_bilinear_form_test.cpp
Original file line number Diff line number Diff line change
@@ -208,7 +208,6 @@ TEST_F(SymmetricBilinearFormTest, Anticommutator) {
TEST_F(SymmetricBilinearFormTest, InnerProductForm) {
Vector<Length, World> v1({1.0 * Metre, 3.0 * Metre, -1.0 * Metre});
Vector<double, World> v2({2.0, 6.0, -5.0});
auto const a = InnerProductForm<World>()(v1, v2);
EXPECT_THAT(InnerProductForm<World>()(v1, v2), Eq(25 * Metre));
}

Original file line number Diff line number Diff line change
@@ -85,9 +85,6 @@ TEST_F(EmbeddedExplicitGeneralizedRungeKuttaNyströmIntegratorTest, Legendre) {
Instant const t_final = t_initial + 0.99 * Second;
double const tolerance = 1e-6;
Variation<double> const derivative_tolerance = 1e-6 / Second;
int const steps_forward = 132;
// We integrate backward with double the tolerance.
int const steps_backward = 112;

int evaluations = 0;
int initial_rejections = 0;
Original file line number Diff line number Diff line change
@@ -338,9 +338,7 @@ TEST_F(EmbeddedExplicitRungeKuttaNyströmIntegratorTest, Restart) {
Length>();
Length const x_initial = 1 * Metre;
Speed const v_initial = 0 * Metre / Second;
Speed const v_amplitude = 1 * Metre / Second;
Time const period = 2 * π * Second;
AngularFrequency const ω = 1 * Radian / Second;
Instant const t_initial;
Time const duration = 10 * period;
Length const length_tolerance = 1 * Milli(Metre);
2 changes: 0 additions & 2 deletions integrators/symmetric_linear_multistep_integrator_test.cpp
Original file line number Diff line number Diff line change
@@ -406,8 +406,6 @@ TEST_P(SymmetricLinearMultistepIntegratorTest, Serialization) {

Mass const m = 1 * Kilogram;
Stiffness const k = SIUnit<Stiffness>();
Energy const initial_energy =
0.5 * m * Pow<2>(v_initial) + 0.5 * k * Pow<2>(q_initial);

std::vector<ODE::SystemState> solution;
ODE harmonic_oscillator;
3 changes: 0 additions & 3 deletions ksp_plugin_test/plugin_test.cpp
Original file line number Diff line number Diff line change
@@ -499,9 +499,6 @@ TEST_F(PluginTest, Initialization) {
}

TEST_F(PluginTest, HierarchicalInitialization) {
// e, i, Ω, ω, and mean anomaly are 0.
KeplerianElements<Barycentric> elements;

// We construct a system as follows, inserting the bodies in the order
// S0, P1, P2, M3.
// |<1 m>| |<1 m>|
3 changes: 0 additions & 3 deletions ksp_plugin_test/vessel_test.cpp
Original file line number Diff line number Diff line change
@@ -56,9 +56,6 @@ using ::testing::MockFunction;
using ::testing::Return;
using ::testing::_;

constexpr MomentOfInertia zero;
constexpr MomentOfInertia one = SIUnit<MomentOfInertia>();

class VesselTest : public testing::Test {
protected:
VesselTest()
13 changes: 7 additions & 6 deletions numerics/cbrt_test.cpp
Original file line number Diff line number Diff line change
@@ -20,12 +20,13 @@ using ::testing::Gt;
using ::testing::Lt;
using ::testing::Truly;

#define EXPECT_SIGNALS(expression, exceptions) \
do { \
std::feclearexcept(FE_ALL_EXCEPT); \
auto const volatile evaluated_signaling_expression = (expression); \
EXPECT_THAT(std::fetestexcept(FE_ALL_EXCEPT), Eq((exceptions))) \
<< "while evaluating " #expression; \
#define EXPECT_SIGNALS(expression, exceptions) \
do { \
std::feclearexcept(FE_ALL_EXCEPT); \
[[maybe_unused]] auto const volatile evaluated_signaling_expression = \
(expression); \
EXPECT_THAT(std::fetestexcept(FE_ALL_EXCEPT), Eq((exceptions))) \
<< "while evaluating " #expression; \
} while (false)

class CubeRootTest : public ::testing::Test {
1 change: 0 additions & 1 deletion numerics/double_precision_test.cpp
Original file line number Diff line number Diff line change
@@ -237,7 +237,6 @@ TEST_F(DoublePrecisionTest, ComparableTwoSum) {
TEST_F(DoublePrecisionTest, Consistencies) {
using Vector = R3Element<double>;
using Point = Point<Vector>;
Point const origin;
DoublePrecision<Point> const wide_origin{};
Vector const null_vector{0, 0, 0};
Vector const v1{π, -e, Sqrt(2)};
1 change: 0 additions & 1 deletion numerics/elliptic_integrals.cpp
Original file line number Diff line number Diff line change
@@ -1333,7 +1333,6 @@ void FukushimaEllipticBDJ(double const nc,
CHECK_LE(0, mc);
if (mc > 1) { // m < 0
// See [Fuk11b] B.1.
double const m = 1 - mc;
double const mcN = 1 / mc;

Angle B_mN{uninitialized};
4 changes: 0 additions & 4 deletions numerics/fast_sin_cos_2π_test.cpp
Original file line number Diff line number Diff line change
@@ -94,10 +94,6 @@ TEST_F(FastSinCos2πTest, Random1000) {
std::mt19937_64 random(42);
std::uniform_int_distribution<> integer_distribution(-1e6, 1e6);
std::uniform_real_distribution<> fractional_distribution(0.0, 1.0);
double max_sin_error = 0.0;
double max_cos_error = 0.0;
double max_sin_error_x = 0.0;
double max_cos_error_x = 0.0;
for (int i = 0; i < iterations_; ++i) {
double const integer = integer_distribution(random);
double const fractional = fractional_distribution(random);
3 changes: 0 additions & 3 deletions numerics/legendre_body.hpp
Original file line number Diff line number Diff line change
@@ -39,9 +39,6 @@ template<int degree_, template<typename, typename, int> class Evaluator>
FORCE_INLINE(constexpr)
PolynomialInMonomialBasis<double, double, degree_, Evaluator>
LegendrePolynomial() {
auto c = LegendreCoefficientsGenerator<
degree_,
std::make_index_sequence<degree_ + 1>>::coefficients;
return PolynomialInMonomialBasis<double, double, degree_, Evaluator>(
LegendreCoefficientsGenerator<
degree_,
2 changes: 1 addition & 1 deletion physics/continuous_trajectory_test.cpp
Original file line number Diff line number Diff line change
@@ -588,7 +588,7 @@ TEST_F(ContinuousTrajectoryTest, Continuity) {

Position<World> const p1 =
trajectory->EvaluatePosition(continuity_time);
Position<World> const p2 =
[[maybe_unused]] Position<World> const p2 =
trajectory->EvaluatePosition(continuity_time + step);
Position<World> const p3 =
trajectory->EvaluatePosition(continuity_time);
2 changes: 0 additions & 2 deletions physics/discrete_trajectory_test.cpp
Original file line number Diff line number Diff line change
@@ -695,8 +695,6 @@ TEST_F(DiscreteTrajectoryTest, TrajectorySerializationSuccess) {
not_null<DiscreteTrajectory<World>*> const fork3 =
massive_trajectory_->NewForkWithCopy(t3_);
fork3->Append(t4_, d4_);
not_null<DiscreteTrajectory<World>*> const fork4 =
fork0->NewForkWithCopy(t4_);
serialization::DiscreteTrajectory message;
serialization::DiscreteTrajectory reference_message;

2 changes: 0 additions & 2 deletions physics/ephemeris_test.cpp
Original file line number Diff line number Diff line change
@@ -751,8 +751,6 @@ TEST_P(EphemerisTest, ComputeGravitationalAccelerationMasslessBody) {
2.6e-15 * Metre / Second),
Ephemeris<ICRS>::unlimited_max_ephemeris_steps);

Speed const v_elephant_y =
trajectory.back().degrees_of_freedom.velocity().coordinates().y;
std::vector<Displacement<ICRS>> elephant_positions;
std::vector<Vector<Acceleration, ICRS>> elephant_accelerations;
for (auto const& [time, degrees_of_freedom] : trajectory) {
10 changes: 0 additions & 10 deletions physics/euler_solver_test.cpp
Original file line number Diff line number Diff line change
@@ -584,8 +584,6 @@ TEST_F(EulerSolverTest, GeneralBodyRotationAlongFirstAxis) {
identity_attitude_(initial_angular_momentum),
identity_attitude_,
Instant());
AngularVelocity<PrincipalAxes> const initial_angular_velocity =
solver.AngularVelocityFor(initial_angular_momentum);

auto const t = Instant() + 10 * Second;
auto const actual_angular_momentum = solver.AngularMomentumAt(t);
@@ -624,8 +622,6 @@ TEST_F(EulerSolverTest, GeneralBodyRotationAlongSecondAxis) {
identity_attitude_(initial_angular_momentum),
identity_attitude_,
Instant());
AngularVelocity<PrincipalAxes> const initial_angular_velocity =
solver.AngularVelocityFor(initial_angular_momentum);

auto const t = Instant() + 10 * Second;
auto const actual_angular_momentum = solver.AngularMomentumAt(t);
@@ -676,8 +672,6 @@ TEST_F(EulerSolverTest, GeneralBodyRotationAlongThirdAxis) {
identity_attitude_(initial_angular_momentum),
identity_attitude_,
Instant());
AngularVelocity<PrincipalAxes> const initial_angular_velocity =
solver.AngularVelocityFor(initial_angular_momentum);

auto const t = Instant() + 10 * Second;
auto const actual_angular_momentum = solver.AngularMomentumAt(t);
@@ -717,8 +711,6 @@ TEST_F(EulerSolverTest, GeneralBodyRotationCloseToThirdAxis) {
identity_attitude_(initial_angular_momentum),
identity_attitude_,
Instant());
AngularVelocity<PrincipalAxes> const initial_angular_velocity =
solver.AngularVelocityFor(initial_angular_momentum);

auto const t = Instant() + 10 * Second;
auto const actual_angular_momentum = solver.AngularMomentumAt(t);
@@ -773,8 +765,6 @@ TEST_F(EulerSolverTest, GeneralBodyRotationVeryCloseToThirdAxis) {
identity_attitude_(initial_angular_momentum),
identity_attitude_,
Instant());
AngularVelocity<PrincipalAxes> const initial_angular_velocity =
solver.AngularVelocityFor(initial_angular_momentum);

auto const t = Instant() + 10 * Second;
auto const actual_angular_momentum = solver.AngularMomentumAt(t);
3 changes: 2 additions & 1 deletion quantities/quantities_test.cpp
Original file line number Diff line number Diff line change
@@ -113,7 +113,8 @@ TEST_F(QuantitiesDeathTest, SerializationError) {
serialization::Quantity message;
message.set_dimensions(0x7C00);
message.set_magnitude(1.0);
Speed const speed_of_light = Speed::ReadFromMessage(message);
[[maybe_unused]] Speed const speed_of_light =
Speed::ReadFromMessage(message);
}, "representation.*dimensions");
}