Clean up the public headers in common. (#1775)

In common, BlockingQueue and RateTimer are not used in any public API and are made internal. `common/utils.h` is unused code and removed. Signed-off-by: Wolfgang Hess <whess@lyft.com>
cartographer-project · Nov 4, 2020 · 38dcf65 · 38dcf65
1 parent 6715afe
commit 38dcf65
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 41 deletions.
diff --git a/cartographer/cloud/internal/local_trajectory_uploader.cc b/cartographer/cloud/internal/local_trajectory_uploader.cc
@@ -25,7 +25,7 @@
 #include "cartographer/cloud/internal/handlers/add_trajectory_handler.h"
 #include "cartographer/cloud/internal/handlers/finish_trajectory_handler.h"
 #include "cartographer/cloud/internal/sensor/serialization.h"
-#include "cartographer/common/blocking_queue.h"
+#include "cartographer/common/internal/blocking_queue.h"
 #include "glog/logging.h"
 #include "grpc++/grpc++.h"
 

diff --git a/cartographer/cloud/internal/map_builder_context_interface.h b/cartographer/cloud/internal/map_builder_context_interface.h
@@ -19,7 +19,7 @@
 
 #include "async_grpc/execution_context.h"
 #include "cartographer/cloud/internal/local_trajectory_uploader.h"
-#include "cartographer/common/blocking_queue.h"
+#include "cartographer/common/internal/blocking_queue.h"
 #include "cartographer/mapping/map_builder_interface.h"
 #include "cartographer/mapping/pose_graph_interface.h"
 #include "cartographer/mapping/proto/serialization.pb.h"

diff --git a/cartographer/cloud/internal/map_builder_server.h b/cartographer/cloud/internal/map_builder_server.h
@@ -23,7 +23,7 @@
 #include "cartographer/cloud/internal/map_builder_context_interface.h"
 #include "cartographer/cloud/map_builder_server_interface.h"
 #include "cartographer/cloud/proto/map_builder_server_options.pb.h"
-#include "cartographer/common/blocking_queue.h"
+#include "cartographer/common/internal/blocking_queue.h"
 #include "cartographer/common/time.h"
 #include "cartographer/mapping/2d/submap_2d.h"
 #include "cartographer/mapping/3d/submap_3d.h"

diff --git a/cartographer/common/blocking_queue.h → ...ographer/common/internal/blocking_queue.h b/cartographer/common/blocking_queue.h → ...ographer/common/internal/blocking_queue.h
diff --git a/cartographer/common/blocking_queue_test.cc → ...er/common/internal/blocking_queue_test.cc b/cartographer/common/blocking_queue_test.cc → ...er/common/internal/blocking_queue_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "cartographer/common/blocking_queue.h"
+#include "cartographer/common/internal/blocking_queue.h"
 
 #include <memory>
 #include <thread>

diff --git a/cartographer/common/rate_timer.h → cartographer/common/internal/rate_timer.h b/cartographer/common/rate_timer.h → cartographer/common/internal/rate_timer.h
diff --git a/cartographer/common/rate_timer_test.cc → ...rapher/common/internal/rate_timer_test.cc b/cartographer/common/rate_timer_test.cc → ...rapher/common/internal/rate_timer_test.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "cartographer/common/rate_timer.h"
+#include "cartographer/common/internal/rate_timer.h"
 
 #include "gtest/gtest.h"
 

diff --git a/cartographer/common/utils.h b/cartographer/common/utils.h
diff --git a/cartographer/mapping/internal/collated_trajectory_builder.h b/cartographer/mapping/internal/collated_trajectory_builder.h
@@ -23,8 +23,8 @@
 #include <set>
 #include <string>
 
+#include "cartographer/common/internal/rate_timer.h"
 #include "cartographer/common/port.h"
-#include "cartographer/common/rate_timer.h"
 #include "cartographer/mapping/local_slam_result_data.h"
 #include "cartographer/mapping/submaps.h"
 #include "cartographer/mapping/trajectory_builder_interface.h"

diff --git a/cartographer/sensor/internal/ordered_multi_queue.h b/cartographer/sensor/internal/ordered_multi_queue.h
@@ -23,7 +23,7 @@
 #include <string>
 #include <tuple>
 
-#include "cartographer/common/blocking_queue.h"
+#include "cartographer/common/internal/blocking_queue.h"
 #include "cartographer/common/port.h"
 #include "cartographer/common/time.h"
 #include "cartographer/sensor/internal/dispatchable.h"