From 4d90a298772d1028fe9f08b429448197da0f2466 Mon Sep 17 00:00:00 2001 From: Wolfgang Hess Date: Wed, 4 Nov 2020 12:16:51 +0100 Subject: [PATCH] Make unusable public headers internal. (#1772) pose_graph_data.h and io test_helpers.h are currently public, i.e. get installed, but cannot possibly be used since they refer to internal headers. Signed-off-by: Wolfgang Hess --- cartographer/cloud/internal/client_server_test.cc | 2 +- cartographer/io/{ => internal}/testing/test_helpers.cc | 2 +- cartographer/io/{ => internal}/testing/test_helpers.h | 0 cartographer/io/proto_stream_deserializer_test.cc | 2 +- cartographer/mapping/internal/2d/pose_graph_2d.h | 2 +- cartographer/mapping/internal/3d/pose_graph_3d.h | 2 +- cartographer/mapping/{ => internal}/pose_graph_data.h | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename cartographer/io/{ => internal}/testing/test_helpers.cc (96%) rename cartographer/io/{ => internal}/testing/test_helpers.h (100%) rename cartographer/mapping/{ => internal}/pose_graph_data.h (100%) diff --git a/cartographer/cloud/internal/client_server_test.cc b/cartographer/cloud/internal/client_server_test.cc index 8a08971..9d8bc38 100644 --- a/cartographer/cloud/internal/client_server_test.cc +++ b/cartographer/cloud/internal/client_server_test.cc @@ -21,9 +21,9 @@ #include "cartographer/cloud/internal/map_builder_server.h" #include "cartographer/cloud/map_builder_server_options.h" #include "cartographer/io/internal/in_memory_proto_stream.h" +#include "cartographer/io/internal/testing/test_helpers.h" #include "cartographer/io/proto_stream.h" #include "cartographer/io/proto_stream_deserializer.h" -#include "cartographer/io/testing/test_helpers.h" #include "cartographer/mapping/internal/testing/mock_map_builder.h" #include "cartographer/mapping/internal/testing/mock_pose_graph.h" #include "cartographer/mapping/internal/testing/mock_trajectory_builder.h" diff --git a/cartographer/io/testing/test_helpers.cc b/cartographer/io/internal/testing/test_helpers.cc similarity index 96% rename from cartographer/io/testing/test_helpers.cc rename to cartographer/io/internal/testing/test_helpers.cc index 00fcf57..96a56d5 100644 --- a/cartographer/io/testing/test_helpers.cc +++ b/cartographer/io/internal/testing/test_helpers.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "cartographer/io/testing/test_helpers.h" +#include "cartographer/io/internal/testing/test_helpers.h" #include "cartographer/mapping/proto/serialization.pb.h" diff --git a/cartographer/io/testing/test_helpers.h b/cartographer/io/internal/testing/test_helpers.h similarity index 100% rename from cartographer/io/testing/test_helpers.h rename to cartographer/io/internal/testing/test_helpers.h diff --git a/cartographer/io/proto_stream_deserializer_test.cc b/cartographer/io/proto_stream_deserializer_test.cc index d221a25..9079799 100644 --- a/cartographer/io/proto_stream_deserializer_test.cc +++ b/cartographer/io/proto_stream_deserializer_test.cc @@ -19,7 +19,7 @@ #include #include "cartographer/io/internal/in_memory_proto_stream.h" -#include "cartographer/io/testing/test_helpers.h" +#include "cartographer/io/internal/testing/test_helpers.h" #include "glog/logging.h" #include "gmock/gmock.h" #include "google/protobuf/text_format.h" diff --git a/cartographer/mapping/internal/2d/pose_graph_2d.h b/cartographer/mapping/internal/2d/pose_graph_2d.h index bf20f42..3733425 100644 --- a/cartographer/mapping/internal/2d/pose_graph_2d.h +++ b/cartographer/mapping/internal/2d/pose_graph_2d.h @@ -35,10 +35,10 @@ #include "cartographer/mapping/2d/submap_2d.h" #include "cartographer/mapping/internal/constraints/constraint_builder_2d.h" #include "cartographer/mapping/internal/optimization/optimization_problem_2d.h" +#include "cartographer/mapping/internal/pose_graph_data.h" #include "cartographer/mapping/internal/trajectory_connectivity_state.h" #include "cartographer/mapping/internal/work_queue.h" #include "cartographer/mapping/pose_graph.h" -#include "cartographer/mapping/pose_graph_data.h" #include "cartographer/mapping/pose_graph_trimmer.h" #include "cartographer/mapping/value_conversion_tables.h" #include "cartographer/metrics/family_factory.h" diff --git a/cartographer/mapping/internal/3d/pose_graph_3d.h b/cartographer/mapping/internal/3d/pose_graph_3d.h index f8467aa..12a3469 100644 --- a/cartographer/mapping/internal/3d/pose_graph_3d.h +++ b/cartographer/mapping/internal/3d/pose_graph_3d.h @@ -36,9 +36,9 @@ #include "cartographer/mapping/internal/constraints/constraint_builder_3d.h" #include "cartographer/mapping/internal/optimization/optimization_problem_3d.h" #include "cartographer/mapping/internal/trajectory_connectivity_state.h" +#include "cartographer/mapping/internal/pose_graph_data.h" #include "cartographer/mapping/internal/work_queue.h" #include "cartographer/mapping/pose_graph.h" -#include "cartographer/mapping/pose_graph_data.h" #include "cartographer/mapping/pose_graph_trimmer.h" #include "cartographer/metrics/family_factory.h" #include "cartographer/sensor/fixed_frame_pose_data.h" diff --git a/cartographer/mapping/pose_graph_data.h b/cartographer/mapping/internal/pose_graph_data.h similarity index 100% rename from cartographer/mapping/pose_graph_data.h rename to cartographer/mapping/internal/pose_graph_data.h