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

Commits on Nov 20, 2021

  1. Fix Clang errors.

    pleroy committed Nov 20, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    makenowjust Hiroya Fujinami
    Copy the full SHA
    0116bd3 View commit details
  2. Copy the full SHA
    841add0 View commit details
  3. Merge pull request #3210 from pleroy/Clang

    Fix some errors found by Clang
    pleroy authored Nov 20, 2021
    Copy the full SHA
    a346e49 View commit details
Showing with 10 additions and 2 deletions.
  1. +1 −0 ksp_plugin/pile_up.cpp
  2. +2 −0 physics/discrete_trajectory_iterator.hpp
  3. +4 −2 physics/discrete_trajectory_segment_body.hpp
  4. +3 −0 physics/discrete_trajectory_segment_iterator.hpp
1 change: 1 addition & 0 deletions ksp_plugin/pile_up.cpp
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include <algorithm>
#include <functional>
#include <iterator>
#include <list>
#include <map>
#include <memory>
2 changes: 2 additions & 0 deletions physics/discrete_trajectory_iterator.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <cstdint>
#include <iterator>
#include <optional>

#include "absl/container/btree_map.h"
@@ -29,6 +30,7 @@ class DiscreteTrajectoryIterator {
typename internal_discrete_trajectory_types::Timeline<Frame>::value_type;
using pointer = value_type const*;
using reference = value_type const&;
using iterator_category = std::random_access_iterator_tag;

DiscreteTrajectoryIterator() = default;

6 changes: 4 additions & 2 deletions physics/discrete_trajectory_segment_body.hpp
Original file line number Diff line number Diff line change
@@ -364,7 +364,8 @@ void DiscreteTrajectorySegment<Frame>::ForgetAfter(
std::int64_t number_of_points_to_remove =
std::distance(begin, timeline_.cend());
number_of_dense_points_ =
std::max(0LL, number_of_dense_points_ - number_of_points_to_remove);
std::max<std::int64_t>(
0, number_of_dense_points_ - number_of_points_to_remove);

timeline_.erase(begin, timeline_.cend());
}
@@ -380,7 +381,8 @@ void DiscreteTrajectorySegment<Frame>::ForgetBefore(
std::int64_t number_of_points_to_remove =
std::distance(timeline_.cbegin(), end);
number_of_dense_points_ =
std::max(0LL, number_of_dense_points_ - number_of_points_to_remove);
std::max<std::int64_t>(
0, number_of_dense_points_ - number_of_points_to_remove);

timeline_.erase(timeline_.cbegin(), end);
}
3 changes: 3 additions & 0 deletions physics/discrete_trajectory_segment_iterator.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include <iterator>

#include "absl/container/btree_map.h"
#include "base/macros.hpp"
#include "base/not_null.hpp"
@@ -41,6 +43,7 @@ class DiscreteTrajectorySegmentIterator {
using value_type = DiscreteTrajectorySegment<Frame>;
using pointer = value_type*;
using reference = value_type&;
using iterator_category = std::bidirectional_iterator_tag ;

DiscreteTrajectorySegmentIterator() = default;