From 5ce6e68dd3c97e3d6bb7dab533f7dd9f8d73b0c8 Mon Sep 17 00:00:00 2001
From: jie <zhengj@google.com>
Date: Thu, 19 Apr 2018 15:10:23 -0700
Subject: [PATCH] Internal cleanup. (#821)

Fix lint error.
---
 cartographer_ros/cartographer_ros/assets_writer.h           | 6 +++---
 cartographer_ros/cartographer_ros/map_builder_bridge.h      | 6 +++---
 cartographer_ros/cartographer_ros/msg_conversion.h          | 6 +++---
 cartographer_ros/cartographer_ros/node.h                    | 6 +++---
 cartographer_ros/cartographer_ros/node_constants.h          | 6 +++---
 cartographer_ros/cartographer_ros/node_options.h            | 6 +++---
 cartographer_ros/cartographer_ros/offline_node.h            | 6 +++---
 cartographer_ros/cartographer_ros/playable_bag.h            | 6 +++---
 cartographer_ros/cartographer_ros/ros_log_sink.h            | 6 +++---
 cartographer_ros/cartographer_ros/ros_map.h                 | 6 +++---
 .../cartographer_ros/ros_map_writing_points_processor.h     | 6 +++---
 cartographer_ros/cartographer_ros/sensor_bridge.h           | 6 +++---
 cartographer_ros/cartographer_ros/split_string.h            | 6 +++---
 cartographer_ros/cartographer_ros/submap.h                  | 6 +++---
 cartographer_ros/cartographer_ros/tf_bridge.h               | 6 +++---
 cartographer_ros/cartographer_ros/time_conversion.h         | 6 +++---
 cartographer_ros/cartographer_ros/trajectory_options.h      | 6 +++---
 cartographer_ros/cartographer_ros/urdf_reader.h             | 6 +++---
 18 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/cartographer_ros/cartographer_ros/assets_writer.h b/cartographer_ros/cartographer_ros/assets_writer.h
index 3c3bf80..c12a87f 100644
--- a/cartographer_ros/cartographer_ros/assets_writer.h
+++ b/cartographer_ros/cartographer_ros/assets_writer.h
@@ -22,8 +22,8 @@
 #include "cartographer/mapping/proto/pose_graph.pb.h"
 #include "cartographer/mapping/proto/trajectory_builder_options.pb.h"
 
-#ifndef CARTOGRAPHER_ROS_ASSETS_WRITER_H_
-#define CARTOGRAPHER_ROS_ASSETS_WRITER_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ASSETS_WRITER_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ASSETS_WRITER_H
 
 namespace cartographer_ros {
 
@@ -60,4 +60,4 @@ class AssetsWriter {
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_ASSETS_WRITER_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ASSETS_WRITER_H
diff --git a/cartographer_ros/cartographer_ros/map_builder_bridge.h b/cartographer_ros/cartographer_ros/map_builder_bridge.h
index f4dc8b9..8682ed1 100644
--- a/cartographer_ros/cartographer_ros/map_builder_bridge.h
+++ b/cartographer_ros/cartographer_ros/map_builder_bridge.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_MAP_BUILDER_BRIDGE_H_
-#define CARTOGRAPHER_ROS_MAP_BUILDER_BRIDGE_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_MAP_BUILDER_BRIDGE_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_MAP_BUILDER_BRIDGE_H
 
 #include <memory>
 #include <set>
@@ -113,4 +113,4 @@ class MapBuilderBridge {
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_MAP_BUILDER_BRIDGE_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_MAP_BUILDER_BRIDGE_H
diff --git a/cartographer_ros/cartographer_ros/msg_conversion.h b/cartographer_ros/cartographer_ros/msg_conversion.h
index b0467ce..b0ab3a8 100644
--- a/cartographer_ros/cartographer_ros/msg_conversion.h
+++ b/cartographer_ros/cartographer_ros/msg_conversion.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_MSG_CONVERSION_H_
-#define CARTOGRAPHER_ROS_MSG_CONVERSION_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_MSG_CONVERSION_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_MSG_CONVERSION_H
 
 #include "cartographer/common/port.h"
 #include "cartographer/common/time.h"
@@ -95,4 +95,4 @@ std::unique_ptr<nav_msgs::OccupancyGrid> CreateOccupancyGridMsg(
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_MSG_CONVERSION_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_MSG_CONVERSION_H
diff --git a/cartographer_ros/cartographer_ros/node.h b/cartographer_ros/cartographer_ros/node.h
index accbc7b..1c7f25c 100644
--- a/cartographer_ros/cartographer_ros/node.h
+++ b/cartographer_ros/cartographer_ros/node.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_NODE_H_
-#define CARTOGRAPHER_ROS_NODE_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_NODE_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_NODE_H
 
 #include <map>
 #include <memory>
@@ -212,4 +212,4 @@ class Node {
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_NODE_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_NODE_H
diff --git a/cartographer_ros/cartographer_ros/node_constants.h b/cartographer_ros/cartographer_ros/node_constants.h
index 6f08506..1065519 100644
--- a/cartographer_ros/cartographer_ros/node_constants.h
+++ b/cartographer_ros/cartographer_ros/node_constants.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_NODE_CONSTANTS_H_
-#define CARTOGRAPHER_ROS_NODE_CONSTANTS_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_NODE_CONSTANTS_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_NODE_CONSTANTS_H
 
 #include <string>
 #include <vector>
@@ -51,4 +51,4 @@ std::vector<std::string> ComputeRepeatedTopicNames(const std::string& topic,
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_NODE_CONSTANTS_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_NODE_CONSTANTS_H
diff --git a/cartographer_ros/cartographer_ros/node_options.h b/cartographer_ros/cartographer_ros/node_options.h
index cd0f997..7acfbba 100644
--- a/cartographer_ros/cartographer_ros/node_options.h
+++ b/cartographer_ros/cartographer_ros/node_options.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_NODE_OPTIONS_H_
-#define CARTOGRAPHER_ROS_NODE_OPTIONS_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_NODE_OPTIONS_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_NODE_OPTIONS_H
 
 #include <string>
 #include <tuple>
@@ -46,4 +46,4 @@ std::tuple<NodeOptions, TrajectoryOptions> LoadOptions(
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_NODE_OPTIONS_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_NODE_OPTIONS_H
diff --git a/cartographer_ros/cartographer_ros/offline_node.h b/cartographer_ros/cartographer_ros/offline_node.h
index de55379..25f4f54 100644
--- a/cartographer_ros/cartographer_ros/offline_node.h
+++ b/cartographer_ros/cartographer_ros/offline_node.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_OFFLINE_NODE_H_
-#define CARTOGRAPHER_ROS_OFFLINE_NODE_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_OFFLINE_NODE_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_OFFLINE_NODE_H
 
 #include <functional>
 #include <memory>
@@ -35,4 +35,4 @@ void RunOfflineNode(const MapBuilderFactory& map_builder_factory);
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_OFFLINE_NODE_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_OFFLINE_NODE_H
diff --git a/cartographer_ros/cartographer_ros/playable_bag.h b/cartographer_ros/cartographer_ros/playable_bag.h
index 423f141..c53f963 100644
--- a/cartographer_ros/cartographer_ros/playable_bag.h
+++ b/cartographer_ros/cartographer_ros/playable_bag.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_PLAYABLE_BAG_H_
-#define CARTOGRAPHER_ROS_PLAYABLE_BAG_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_PLAYABLE_BAG_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_PLAYABLE_BAG_H
 #include <functional>
 #include <queue>
 
@@ -94,4 +94,4 @@ class PlayableBagMultiplexer {
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_PLAYABLE_BAG_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_PLAYABLE_BAG_H
diff --git a/cartographer_ros/cartographer_ros/ros_log_sink.h b/cartographer_ros/cartographer_ros/ros_log_sink.h
index deffc2b..28538bf 100644
--- a/cartographer_ros/cartographer_ros/ros_log_sink.h
+++ b/cartographer_ros/cartographer_ros/ros_log_sink.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_ROS_LOG_SINK_H_
-#define CARTOGRAPHER_ROS_ROS_LOG_SINK_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ROS_LOG_SINK_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ROS_LOG_SINK_H
 
 #include <ctime>
 
@@ -42,4 +42,4 @@ class ScopedRosLogSink : public ::google::LogSink {
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_ROS_LOG_SINK_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ROS_LOG_SINK_H
diff --git a/cartographer_ros/cartographer_ros/ros_map.h b/cartographer_ros/cartographer_ros/ros_map.h
index 6cfde6e..4336a16 100644
--- a/cartographer_ros/cartographer_ros/ros_map.h
+++ b/cartographer_ros/cartographer_ros/ros_map.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_ROS_MAP_H_
-#define CARTOGRAPHER_ROS_ROS_MAP_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ROS_MAP_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ROS_MAP_H
 
 #include <string>
 
@@ -38,4 +38,4 @@ void WriteYaml(const double resolution, const Eigen::Vector2d& origin,
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_ROS_MAP_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ROS_MAP_H
diff --git a/cartographer_ros/cartographer_ros/ros_map_writing_points_processor.h b/cartographer_ros/cartographer_ros/ros_map_writing_points_processor.h
index 5ac32f7..79a143c 100644
--- a/cartographer_ros/cartographer_ros/ros_map_writing_points_processor.h
+++ b/cartographer_ros/cartographer_ros/ros_map_writing_points_processor.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_ROS_MAP_WRITING_POINTS_PROCESSOR_H_
-#define CARTOGRAPHER_ROS_ROS_MAP_WRITING_POINTS_PROCESSOR_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ROS_MAP_WRITING_POINTS_PROCESSOR_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ROS_MAP_WRITING_POINTS_PROCESSOR_H
 
 #include "cartographer/common/lua_parameter_dictionary.h"
 #include "cartographer/io/file_writer.h"
@@ -62,4 +62,4 @@ class RosMapWritingPointsProcessor
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_ROS_MAP_WRITING_POINTS_PROCESSOR_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_ROS_MAP_WRITING_POINTS_PROCESSOR_H
diff --git a/cartographer_ros/cartographer_ros/sensor_bridge.h b/cartographer_ros/cartographer_ros/sensor_bridge.h
index 8485ea0..b00ddc1 100644
--- a/cartographer_ros/cartographer_ros/sensor_bridge.h
+++ b/cartographer_ros/cartographer_ros/sensor_bridge.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_SENSOR_BRIDGE_H_
-#define CARTOGRAPHER_ROS_SENSOR_BRIDGE_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_SENSOR_BRIDGE_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_SENSOR_BRIDGE_H
 
 #include <memory>
 
@@ -97,4 +97,4 @@ class SensorBridge {
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_SENSOR_BRIDGE_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_SENSOR_BRIDGE_H
diff --git a/cartographer_ros/cartographer_ros/split_string.h b/cartographer_ros/cartographer_ros/split_string.h
index 0aea425..f12afbb 100644
--- a/cartographer_ros/cartographer_ros/split_string.h
+++ b/cartographer_ros/cartographer_ros/split_string.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_SPLIT_STRING_H_
-#define CARTOGRAPHER_ROS_SPLIT_STRING_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_SPLIT_STRING_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_SPLIT_STRING_H
 
 #include <string>
 #include <vector>
@@ -27,4 +27,4 @@ std::vector<std::string> SplitString(const std::string& input, char delimiter);
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_SPLIT_STRING_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_SPLIT_STRING_H
diff --git a/cartographer_ros/cartographer_ros/submap.h b/cartographer_ros/cartographer_ros/submap.h
index 8091f8b..0df2215 100644
--- a/cartographer_ros/cartographer_ros/submap.h
+++ b/cartographer_ros/cartographer_ros/submap.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_SUBMAP_H_
-#define CARTOGRAPHER_ROS_SUBMAP_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_SUBMAP_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_SUBMAP_H
 
 #include <memory>
 #include <string>
@@ -37,4 +37,4 @@ std::unique_ptr<::cartographer::io::SubmapTextures> FetchSubmapTextures(
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_SUBMAP_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_SUBMAP_H
diff --git a/cartographer_ros/cartographer_ros/tf_bridge.h b/cartographer_ros/cartographer_ros/tf_bridge.h
index 878ce41..d65f189 100644
--- a/cartographer_ros/cartographer_ros/tf_bridge.h
+++ b/cartographer_ros/cartographer_ros/tf_bridge.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_TF_BRIDGE_H_
-#define CARTOGRAPHER_ROS_TF_BRIDGE_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_TF_BRIDGE_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_TF_BRIDGE_H
 
 #include <memory>
 
@@ -48,4 +48,4 @@ class TfBridge {
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_TF_BRIDGE_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_TF_BRIDGE_H
diff --git a/cartographer_ros/cartographer_ros/time_conversion.h b/cartographer_ros/cartographer_ros/time_conversion.h
index 12c354d..dda5bb5 100644
--- a/cartographer_ros/cartographer_ros/time_conversion.h
+++ b/cartographer_ros/cartographer_ros/time_conversion.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_TIME_CONVERSION_H_
-#define CARTOGRAPHER_ROS_TIME_CONVERSION_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_TIME_CONVERSION_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_TIME_CONVERSION_H
 
 #include "cartographer/common/time.h"
 #include "ros/ros.h"
@@ -28,4 +28,4 @@ namespace cartographer_ros {
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_TIME_CONVERSION_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_TIME_CONVERSION_H
diff --git a/cartographer_ros/cartographer_ros/trajectory_options.h b/cartographer_ros/cartographer_ros/trajectory_options.h
index c39b039..97be4c9 100644
--- a/cartographer_ros/cartographer_ros/trajectory_options.h
+++ b/cartographer_ros/cartographer_ros/trajectory_options.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_TRAJECTORY_OPTIONS_H_
-#define CARTOGRAPHER_ROS_TRAJECTORY_OPTIONS_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_TRAJECTORY_OPTIONS_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_TRAJECTORY_OPTIONS_H
 
 #include <string>
 
@@ -69,4 +69,4 @@ cartographer_ros_msgs::TrajectoryOptions ToRosMessage(
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_TRAJECTORY_OPTIONS_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_TRAJECTORY_OPTIONS_H
diff --git a/cartographer_ros/cartographer_ros/urdf_reader.h b/cartographer_ros/cartographer_ros/urdf_reader.h
index bb34a0e..93d8d11 100644
--- a/cartographer_ros/cartographer_ros/urdf_reader.h
+++ b/cartographer_ros/cartographer_ros/urdf_reader.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_ROS_URDF_READER_H_
-#define CARTOGRAPHER_ROS_URDF_READER_H_
+#ifndef CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_URDF_READER_H
+#define CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_URDF_READER_H
 
 #include <vector>
 
@@ -29,4 +29,4 @@ std::vector<geometry_msgs::TransformStamped> ReadStaticTransformsFromUrdf(
 
 }  // namespace cartographer_ros
 
-#endif  // CARTOGRAPHER_ROS_URDF_READER_H_
+#endif  // CARTOGRAPHER_ROS_CARTOGRAPHER_ROS_URDF_READER_H