Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix more Clang errors #3212

Merged
merged 1 commit into from
Nov 21, 2021
Merged

Fix more Clang errors #3212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ endif
TEST_LIBS := $(DEP_DIR)benchmark/src/libbenchmark.a $(DEP_DIR)protobuf/src/.libs/libprotobuf.a
ABSL_LIBS := \
$(DEP_DIR)abseil-cpp/absl/base/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/container/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/debugging/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/hash/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/numeric/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/status/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/strings/libabsl_*.a \
Expand Down
2 changes: 1 addition & 1 deletion physics/discrete_trajectory_body.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ DiscreteTrajectory<Frame>::NewSegment() {
}

template<typename Frame>
typename DiscreteTrajectory<Frame>::DiscreteTrajectory
DiscreteTrajectory<Frame>
DiscreteTrajectory<Frame>::DetachSegments(SegmentIterator const begin) {
DiscreteTrajectory detached(uninitialized);

Expand Down
3 changes: 2 additions & 1 deletion physics/discrete_trajectory_segment_body.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,8 @@ void DiscreteTrajectorySegment<Frame>::WriteToMessage(
serialized_downsampling_parameters->mutable_tolerance());
}
message->set_number_of_dense_points(
std::max(0LL, number_of_dense_points_ - number_of_points_to_skip_at_end));
std::max<std::int64_t>(
0, number_of_dense_points_ - number_of_points_to_skip_at_end));

// Convert the |exact| vector into a set, and add the extremities. This
// ensures that we don't have redundancies. The set is sorted by time to
Expand Down