mockingbirdnest · Nov 20, 2021 · Nov 20, 2021 · Nov 20, 2021
Showing with 10 additions and 2 deletions.

+1 −0 ksp_plugin/pile_up.cpp

+2 −0 physics/discrete_trajectory_iterator.hpp

+4 −2 physics/discrete_trajectory_segment_body.hpp

+3 −0 physics/discrete_trajectory_segment_iterator.hpp
diff --git a/ksp_plugin/pile_up.cpp b/ksp_plugin/pile_up.cpp
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <iterator>
 #include <list>
 #include <map>
 #include <memory>

diff --git a/physics/discrete_trajectory_iterator.hpp b/physics/discrete_trajectory_iterator.hpp
@@ -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;
 

diff --git a/physics/discrete_trajectory_segment_body.hpp b/physics/discrete_trajectory_segment_body.hpp
@@ -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);
 }

diff --git a/physics/discrete_trajectory_segment_iterator.hpp b/physics/discrete_trajectory_segment_iterator.hpp
@@ -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;