From 035162d86546c63ad431521c1c2fec9d0fe24c37 Mon Sep 17 00:00:00 2001 From: Michael Grupp Date: Wed, 10 Apr 2019 13:04:57 +0200 Subject: [PATCH] Update clang-format to new Google style. (#1564) Apparently the format bot uses a bleeding edge clang-format that uses the new Google style and reformats a bunch of files in every PR. This is an empty commit to trigger this in a separate commit. See https://github.com/llvm-mirror/clang/commit/62e3198c4f5490a1c60ba51d81fe2e1f0dc99135 --- cartographer/cloud/internal/client/pose_graph_stub.cc | 1 + .../handlers/add_fixed_frame_pose_data_handler_test.cc | 1 + .../cloud/internal/handlers/add_imu_data_handler_test.cc | 1 + .../internal/handlers/add_landmark_data_handler_test.cc | 1 + .../internal/handlers/add_odometry_data_handler_test.cc | 1 + .../internal/handlers/add_rangefinder_data_handler_test.cc | 1 + .../cloud/internal/handlers/add_trajectory_handler_test.cc | 1 + .../internal/handlers/get_landmark_poses_handler_test.cc | 1 + .../internal/handlers/set_landmark_pose_handler_test.cc | 1 + cartographer/cloud/internal/map_builder_context_impl.cc | 2 -- cartographer/common/lockless_queue_test.cc | 1 + cartographer/common/port.h | 7 +++---- cartographer/common/time.cc | 1 + cartographer/io/fake_file_writer_test.cc | 3 ++- cartographer/io/internal/in_memory_proto_stream_test.cc | 2 +- cartographer/io/internal/mapping_state_serialization.cc | 1 + cartographer/io/probability_grid_points_processor_test.cc | 1 + cartographer/io/proto_stream.cc | 1 + cartographer/io/proto_stream_deserializer_test.cc | 3 ++- cartographer/io/testing/test_helpers.cc | 1 + cartographer/mapping/2d/range_data_inserter_2d_test.cc | 3 +-- cartographer/mapping/2d/submap_2d_test.cc | 2 +- cartographer/mapping/detect_floors.h | 3 +-- cartographer/mapping/internal/2d/local_slam_result_2d.cc | 1 + cartographer/mapping/internal/2d/normal_estimation_2d.h | 1 + .../2d/scan_matching/correlative_scan_matcher_test.cc | 1 - .../2d/scan_matching/occupied_space_cost_function_2d.cc | 1 + .../scan_matching/occupied_space_cost_function_2d_test.cc | 1 - .../2d/scan_matching/tsdf_match_cost_function_2d_test.cc | 1 - cartographer/mapping/internal/3d/local_slam_result_3d.cc | 1 + .../internal/constraints/constraint_builder_2d_test.cc | 2 +- cartographer/mapping/map_builder.h | 3 +-- cartographer/mapping/range_data_inserter_interface.cc | 1 + cartographer/sensor/point_cloud_test.cc | 2 +- 34 files changed, 34 insertions(+), 21 deletions(-) diff --git a/cartographer/cloud/internal/client/pose_graph_stub.cc b/cartographer/cloud/internal/client/pose_graph_stub.cc index 76f1c88..f7ff9ad 100644 --- a/cartographer/cloud/internal/client/pose_graph_stub.cc +++ b/cartographer/cloud/internal/client/pose_graph_stub.cc @@ -15,6 +15,7 @@ */ #include "cartographer/cloud/internal/client/pose_graph_stub.h" + #include "async_grpc/client.h" #include "cartographer/cloud/internal/handlers/delete_trajectory_handler.h" #include "cartographer/cloud/internal/handlers/get_all_submap_poses.h" diff --git a/cartographer/cloud/internal/handlers/add_fixed_frame_pose_data_handler_test.cc b/cartographer/cloud/internal/handlers/add_fixed_frame_pose_data_handler_test.cc index f92d2c7..33c0dbf 100644 --- a/cartographer/cloud/internal/handlers/add_fixed_frame_pose_data_handler_test.cc +++ b/cartographer/cloud/internal/handlers/add_fixed_frame_pose_data_handler_test.cc @@ -15,6 +15,7 @@ */ #include "cartographer/cloud/internal/handlers/add_fixed_frame_pose_data_handler.h" + #include "cartographer/cloud/internal/testing/handler_test.h" #include "cartographer/cloud/internal/testing/test_helpers.h" #include "google/protobuf/text_format.h" diff --git a/cartographer/cloud/internal/handlers/add_imu_data_handler_test.cc b/cartographer/cloud/internal/handlers/add_imu_data_handler_test.cc index 679f206..4052a86 100644 --- a/cartographer/cloud/internal/handlers/add_imu_data_handler_test.cc +++ b/cartographer/cloud/internal/handlers/add_imu_data_handler_test.cc @@ -15,6 +15,7 @@ */ #include "cartographer/cloud/internal/handlers/add_imu_data_handler.h" + #include "cartographer/cloud/internal/testing/handler_test.h" #include "cartographer/cloud/internal/testing/test_helpers.h" #include "google/protobuf/text_format.h" diff --git a/cartographer/cloud/internal/handlers/add_landmark_data_handler_test.cc b/cartographer/cloud/internal/handlers/add_landmark_data_handler_test.cc index 0b72934..5f772cd 100644 --- a/cartographer/cloud/internal/handlers/add_landmark_data_handler_test.cc +++ b/cartographer/cloud/internal/handlers/add_landmark_data_handler_test.cc @@ -15,6 +15,7 @@ */ #include "cartographer/cloud/internal/handlers/add_landmark_data_handler.h" + #include "cartographer/cloud/internal/testing/handler_test.h" #include "cartographer/cloud/internal/testing/test_helpers.h" #include "google/protobuf/text_format.h" diff --git a/cartographer/cloud/internal/handlers/add_odometry_data_handler_test.cc b/cartographer/cloud/internal/handlers/add_odometry_data_handler_test.cc index 6187e8a..e0571a8 100644 --- a/cartographer/cloud/internal/handlers/add_odometry_data_handler_test.cc +++ b/cartographer/cloud/internal/handlers/add_odometry_data_handler_test.cc @@ -15,6 +15,7 @@ */ #include "cartographer/cloud/internal/handlers/add_odometry_data_handler.h" + #include "cartographer/cloud/internal/testing/handler_test.h" #include "cartographer/cloud/internal/testing/test_helpers.h" #include "google/protobuf/text_format.h" diff --git a/cartographer/cloud/internal/handlers/add_rangefinder_data_handler_test.cc b/cartographer/cloud/internal/handlers/add_rangefinder_data_handler_test.cc index a7af01e..63b0642 100644 --- a/cartographer/cloud/internal/handlers/add_rangefinder_data_handler_test.cc +++ b/cartographer/cloud/internal/handlers/add_rangefinder_data_handler_test.cc @@ -15,6 +15,7 @@ */ #include "cartographer/cloud/internal/handlers/add_rangefinder_data_handler.h" + #include "cartographer/cloud/internal/testing/handler_test.h" #include "cartographer/cloud/internal/testing/test_helpers.h" #include "google/protobuf/text_format.h" diff --git a/cartographer/cloud/internal/handlers/add_trajectory_handler_test.cc b/cartographer/cloud/internal/handlers/add_trajectory_handler_test.cc index d05ec5d..4bbb209 100644 --- a/cartographer/cloud/internal/handlers/add_trajectory_handler_test.cc +++ b/cartographer/cloud/internal/handlers/add_trajectory_handler_test.cc @@ -15,6 +15,7 @@ */ #include "cartographer/cloud/internal/handlers/add_trajectory_handler.h" + #include "cartographer/cloud/internal/sensor/serialization.h" #include "cartographer/cloud/internal/testing/handler_test.h" #include "cartographer/cloud/internal/testing/test_helpers.h" diff --git a/cartographer/cloud/internal/handlers/get_landmark_poses_handler_test.cc b/cartographer/cloud/internal/handlers/get_landmark_poses_handler_test.cc index 20067fa..be45875 100644 --- a/cartographer/cloud/internal/handlers/get_landmark_poses_handler_test.cc +++ b/cartographer/cloud/internal/handlers/get_landmark_poses_handler_test.cc @@ -15,6 +15,7 @@ */ #include "cartographer/cloud/internal/handlers/get_landmark_poses_handler.h" + #include "cartographer/cloud/internal/testing/handler_test.h" #include "cartographer/cloud/internal/testing/test_helpers.h" #include "google/protobuf/text_format.h" diff --git a/cartographer/cloud/internal/handlers/set_landmark_pose_handler_test.cc b/cartographer/cloud/internal/handlers/set_landmark_pose_handler_test.cc index 015b517..485c594 100644 --- a/cartographer/cloud/internal/handlers/set_landmark_pose_handler_test.cc +++ b/cartographer/cloud/internal/handlers/set_landmark_pose_handler_test.cc @@ -15,6 +15,7 @@ */ #include "cartographer/cloud/internal/handlers/set_landmark_pose_handler.h" + #include "cartographer/cloud/internal/testing/handler_test.h" #include "cartographer/cloud/internal/testing/test_helpers.h" #include "cartographer/transform/rigid_transform_test_helpers.h" diff --git a/cartographer/cloud/internal/map_builder_context_impl.cc b/cartographer/cloud/internal/map_builder_context_impl.cc index 4606046..3f3c462 100644 --- a/cartographer/cloud/internal/map_builder_context_impl.cc +++ b/cartographer/cloud/internal/map_builder_context_impl.cc @@ -14,8 +14,6 @@ * limitations under the License. */ -#include "cartographer/cloud/internal/map_builder_server.h" - #include "cartographer/cloud/internal/map_builder_server.h" #include "cartographer/mapping/internal/2d/local_slam_result_2d.h" #include "cartographer/mapping/internal/3d/local_slam_result_3d.h" diff --git a/cartographer/common/lockless_queue_test.cc b/cartographer/common/lockless_queue_test.cc index f1f247c..5553c35 100644 --- a/cartographer/common/lockless_queue_test.cc +++ b/cartographer/common/lockless_queue_test.cc @@ -1,4 +1,5 @@ #include "cartographer/common/lockless_queue.h" + #include "gtest/gtest.h" namespace cartographer { diff --git a/cartographer/common/port.h b/cartographer/common/port.h index 338861f..eec8469 100644 --- a/cartographer/common/port.h +++ b/cartographer/common/port.h @@ -17,13 +17,12 @@ #ifndef CARTOGRAPHER_COMMON_PORT_H_ #define CARTOGRAPHER_COMMON_PORT_H_ -#include -#include -#include - #include #include #include +#include +#include +#include namespace cartographer { diff --git a/cartographer/common/time.cc b/cartographer/common/time.cc index a2c90d2..e74eead 100644 --- a/cartographer/common/time.cc +++ b/cartographer/common/time.cc @@ -17,6 +17,7 @@ #include "cartographer/common/time.h" #include + #include #include #include diff --git a/cartographer/io/fake_file_writer_test.cc b/cartographer/io/fake_file_writer_test.cc index 6189b92..711e916 100644 --- a/cartographer/io/fake_file_writer_test.cc +++ b/cartographer/io/fake_file_writer_test.cc @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "cartographer/io/fake_file_writer.h" + #include -#include "cartographer/io/fake_file_writer.h" #include "glog/logging.h" #include "gtest/gtest.h" diff --git a/cartographer/io/internal/in_memory_proto_stream_test.cc b/cartographer/io/internal/in_memory_proto_stream_test.cc index 9dd3a1e..e274472 100644 --- a/cartographer/io/internal/in_memory_proto_stream_test.cc +++ b/cartographer/io/internal/in_memory_proto_stream_test.cc @@ -15,9 +15,9 @@ */ #include "cartographer/io/internal/in_memory_proto_stream.h" + #include "cartographer/mapping/proto/pose_graph.pb.h" #include "cartographer/mapping/proto/serialization.pb.h" - #include "gtest/gtest.h" namespace cartographer { diff --git a/cartographer/io/internal/mapping_state_serialization.cc b/cartographer/io/internal/mapping_state_serialization.cc index a34c867..8305e7a 100644 --- a/cartographer/io/internal/mapping_state_serialization.cc +++ b/cartographer/io/internal/mapping_state_serialization.cc @@ -15,6 +15,7 @@ */ #include "cartographer/io/internal/mapping_state_serialization.h" + #include "cartographer/mapping/proto/serialization.pb.h" #include "cartographer/transform/transform.h" diff --git a/cartographer/io/probability_grid_points_processor_test.cc b/cartographer/io/probability_grid_points_processor_test.cc index b3fc73f..99753bb 100644 --- a/cartographer/io/probability_grid_points_processor_test.cc +++ b/cartographer/io/probability_grid_points_processor_test.cc @@ -17,6 +17,7 @@ #include "cartographer/io/probability_grid_points_processor.h" #include + #include "cartographer/common/lua_parameter_dictionary.h" #include "cartographer/common/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/port.h" diff --git a/cartographer/io/proto_stream.cc b/cartographer/io/proto_stream.cc index f55a3a6..60ea021 100644 --- a/cartographer/io/proto_stream.cc +++ b/cartographer/io/proto_stream.cc @@ -15,6 +15,7 @@ */ #include "cartographer/io/proto_stream.h" + #include "glog/logging.h" namespace cartographer { diff --git a/cartographer/io/proto_stream_deserializer_test.cc b/cartographer/io/proto_stream_deserializer_test.cc index 44e5a0b..d221a25 100644 --- a/cartographer/io/proto_stream_deserializer_test.cc +++ b/cartographer/io/proto_stream_deserializer_test.cc @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "cartographer/io/proto_stream_deserializer.h" + #include #include "cartographer/io/internal/in_memory_proto_stream.h" -#include "cartographer/io/proto_stream_deserializer.h" #include "cartographer/io/testing/test_helpers.h" #include "glog/logging.h" #include "gmock/gmock.h" diff --git a/cartographer/io/testing/test_helpers.cc b/cartographer/io/testing/test_helpers.cc index 1e9fbab..00fcf57 100644 --- a/cartographer/io/testing/test_helpers.cc +++ b/cartographer/io/testing/test_helpers.cc @@ -15,6 +15,7 @@ */ #include "cartographer/io/testing/test_helpers.h" + #include "cartographer/mapping/proto/serialization.pb.h" namespace cartographer { diff --git a/cartographer/mapping/2d/range_data_inserter_2d_test.cc b/cartographer/mapping/2d/range_data_inserter_2d_test.cc index 587573d..1725334 100644 --- a/cartographer/mapping/2d/range_data_inserter_2d_test.cc +++ b/cartographer/mapping/2d/range_data_inserter_2d_test.cc @@ -14,14 +14,13 @@ * limitations under the License. */ -#include "cartographer/mapping/2d/probability_grid_range_data_inserter_2d.h" - #include #include "absl/memory/memory.h" #include "cartographer/common/lua_parameter_dictionary.h" #include "cartographer/common/lua_parameter_dictionary_test_helpers.h" #include "cartographer/mapping/2d/probability_grid.h" +#include "cartographer/mapping/2d/probability_grid_range_data_inserter_2d.h" #include "cartographer/mapping/probability_values.h" #include "gmock/gmock.h" diff --git a/cartographer/mapping/2d/submap_2d_test.cc b/cartographer/mapping/2d/submap_2d_test.cc index 3b9d41a..6b32b8a 100644 --- a/cartographer/mapping/2d/submap_2d_test.cc +++ b/cartographer/mapping/2d/submap_2d_test.cc @@ -15,7 +15,6 @@ */ #include "cartographer/mapping/2d/submap_2d.h" -#include "cartographer/mapping/2d/probability_grid.h" #include #include @@ -25,6 +24,7 @@ #include "cartographer/common/lua_parameter_dictionary.h" #include "cartographer/common/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/port.h" +#include "cartographer/mapping/2d/probability_grid.h" #include "cartographer/transform/transform.h" #include "gmock/gmock.h" diff --git a/cartographer/mapping/detect_floors.h b/cartographer/mapping/detect_floors.h index 189086f..b5acde8 100644 --- a/cartographer/mapping/detect_floors.h +++ b/cartographer/mapping/detect_floors.h @@ -17,9 +17,8 @@ #ifndef CARTOGRAPHER_MAPPING_DETECT_FLOORS_H_ #define CARTOGRAPHER_MAPPING_DETECT_FLOORS_H_ -#include "cartographer/mapping/proto/trajectory.pb.h" - #include "cartographer/common/time.h" +#include "cartographer/mapping/proto/trajectory.pb.h" namespace cartographer { namespace mapping { diff --git a/cartographer/mapping/internal/2d/local_slam_result_2d.cc b/cartographer/mapping/internal/2d/local_slam_result_2d.cc index 05b078c..d068d01 100644 --- a/cartographer/mapping/internal/2d/local_slam_result_2d.cc +++ b/cartographer/mapping/internal/2d/local_slam_result_2d.cc @@ -15,6 +15,7 @@ */ #include "cartographer/mapping/internal/2d/local_slam_result_2d.h" + #include "cartographer/mapping/internal/2d/pose_graph_2d.h" namespace cartographer { diff --git a/cartographer/mapping/internal/2d/normal_estimation_2d.h b/cartographer/mapping/internal/2d/normal_estimation_2d.h index f3d937d..61e0a2f 100644 --- a/cartographer/mapping/internal/2d/normal_estimation_2d.h +++ b/cartographer/mapping/internal/2d/normal_estimation_2d.h @@ -18,6 +18,7 @@ #define CARTOGRAPHER_MAPPING_INTERNAL_NORMAL_ESTIMATION_2D_H_ #include + #include "cartographer/mapping/proto/2d/normal_estimation_options_2d.pb.h" #include "cartographer/sensor/point_cloud.h" #include "cartographer/sensor/range_data.h" diff --git a/cartographer/mapping/internal/2d/scan_matching/correlative_scan_matcher_test.cc b/cartographer/mapping/internal/2d/scan_matching/correlative_scan_matcher_test.cc index 29a076b..ce513a9 100644 --- a/cartographer/mapping/internal/2d/scan_matching/correlative_scan_matcher_test.cc +++ b/cartographer/mapping/internal/2d/scan_matching/correlative_scan_matcher_test.cc @@ -15,7 +15,6 @@ */ #include "cartographer/mapping/internal/2d/scan_matching/correlative_scan_matcher_2d.h" - #include "cartographer/sensor/point_cloud.h" #include "gtest/gtest.h" diff --git a/cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d.cc b/cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d.cc index 3cf182a..0c4422e 100644 --- a/cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d.cc +++ b/cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d.cc @@ -15,6 +15,7 @@ */ #include "cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d.h" + #include "cartographer/mapping/probability_values.h" #include "ceres/cubic_interpolation.h" diff --git a/cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d_test.cc b/cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d_test.cc index 240e1c8..4cc82e2 100644 --- a/cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d_test.cc +++ b/cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d_test.cc @@ -18,7 +18,6 @@ #include "cartographer/mapping/2d/probability_grid.h" #include "cartographer/mapping/probability_values.h" - #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/cartographer/mapping/internal/2d/scan_matching/tsdf_match_cost_function_2d_test.cc b/cartographer/mapping/internal/2d/scan_matching/tsdf_match_cost_function_2d_test.cc index c25840f..5c6b584 100644 --- a/cartographer/mapping/internal/2d/scan_matching/tsdf_match_cost_function_2d_test.cc +++ b/cartographer/mapping/internal/2d/scan_matching/tsdf_match_cost_function_2d_test.cc @@ -20,7 +20,6 @@ #include "cartographer/common/lua_parameter_dictionary_test_helpers.h" #include "cartographer/mapping/2d/tsdf_2d.h" #include "cartographer/mapping/2d/tsdf_range_data_inserter_2d.h" - #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/cartographer/mapping/internal/3d/local_slam_result_3d.cc b/cartographer/mapping/internal/3d/local_slam_result_3d.cc index 6143008..6f8e703 100644 --- a/cartographer/mapping/internal/3d/local_slam_result_3d.cc +++ b/cartographer/mapping/internal/3d/local_slam_result_3d.cc @@ -15,6 +15,7 @@ */ #include "cartographer/mapping/internal/3d/local_slam_result_3d.h" + #include "cartographer/mapping/internal/3d/pose_graph_3d.h" namespace cartographer { diff --git a/cartographer/mapping/internal/constraints/constraint_builder_2d_test.cc b/cartographer/mapping/internal/constraints/constraint_builder_2d_test.cc index 066bb8c..f80fad9 100644 --- a/cartographer/mapping/internal/constraints/constraint_builder_2d_test.cc +++ b/cartographer/mapping/internal/constraints/constraint_builder_2d_test.cc @@ -15,11 +15,11 @@ */ #include "cartographer/mapping/internal/constraints/constraint_builder_2d.h" -#include "cartographer/mapping/2d/probability_grid.h" #include #include "cartographer/common/internal/testing/thread_pool_for_testing.h" +#include "cartographer/mapping/2d/probability_grid.h" #include "cartographer/mapping/2d/submap_2d.h" #include "cartographer/mapping/internal/constraints/constraint_builder.h" #include "cartographer/mapping/internal/testing/test_helpers.h" diff --git a/cartographer/mapping/map_builder.h b/cartographer/mapping/map_builder.h index 72a8e26..8e6db5d 100644 --- a/cartographer/mapping/map_builder.h +++ b/cartographer/mapping/map_builder.h @@ -17,11 +17,10 @@ #ifndef CARTOGRAPHER_MAPPING_MAP_BUILDER_H_ #define CARTOGRAPHER_MAPPING_MAP_BUILDER_H_ -#include "cartographer/mapping/map_builder_interface.h" - #include #include "cartographer/common/thread_pool.h" +#include "cartographer/mapping/map_builder_interface.h" #include "cartographer/mapping/pose_graph.h" #include "cartographer/mapping/proto/map_builder_options.pb.h" #include "cartographer/sensor/collator_interface.h" diff --git a/cartographer/mapping/range_data_inserter_interface.cc b/cartographer/mapping/range_data_inserter_interface.cc index cf01396..79d8c8d 100644 --- a/cartographer/mapping/range_data_inserter_interface.cc +++ b/cartographer/mapping/range_data_inserter_interface.cc @@ -15,6 +15,7 @@ */ #include "cartographer/mapping/range_data_inserter_interface.h" + #include "cartographer/mapping/2d/probability_grid_range_data_inserter_2d.h" #include "cartographer/mapping/2d/tsdf_range_data_inserter_2d.h" diff --git a/cartographer/sensor/point_cloud_test.cc b/cartographer/sensor/point_cloud_test.cc index 0a6d9df..4f547fe 100644 --- a/cartographer/sensor/point_cloud_test.cc +++ b/cartographer/sensor/point_cloud_test.cc @@ -15,10 +15,10 @@ */ #include "cartographer/sensor/point_cloud.h" -#include "cartographer/transform/transform.h" #include +#include "cartographer/transform/transform.h" #include "gtest/gtest.h" namespace cartographer {