gazebo_ros/include: fix cpplint build_order errors

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
ros-simulation · May 3, 2022 · 31b73c5 · 31b73c5
1 parent 0d3aa91
commit 31b73c5
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 20 deletions.
diff --git a/gazebo_ros/include/gazebo_ros/conversions/builtin_interfaces.hpp b/gazebo_ros/include/gazebo_ros/conversions/builtin_interfaces.hpp
@@ -16,9 +16,9 @@
 #define GAZEBO_ROS__CONVERSIONS__BUILTIN_INTERFACES_HPP_
 
 #include <gazebo/msgs/time.pb.h>
+#include <gazebo/common/Time.hh>
 
 #include <builtin_interfaces/msg/time.hpp>
-#include <gazebo/common/Time.hh>
 
 #include "gazebo_ros/conversions/generic.hpp"
 

diff --git a/gazebo_ros/include/gazebo_ros/conversions/gazebo_msgs.hpp b/gazebo_ros/include/gazebo_ros/conversions/gazebo_msgs.hpp
@@ -16,11 +16,12 @@
 #define GAZEBO_ROS__CONVERSIONS__GAZEBO_MSGS_HPP_
 
 #include <gazebo/msgs/contacts.pb.h>
-#include <gazebo_msgs/msg/contact_state.hpp>
-#include <gazebo_msgs/msg/contacts_state.hpp>
 
 #include <sstream>
 
+#include <gazebo_msgs/msg/contact_state.hpp>
+#include <gazebo_msgs/msg/contacts_state.hpp>
+
 #include "gazebo_ros/conversions/builtin_interfaces.hpp"
 #include "gazebo_ros/conversions/generic.hpp"
 #include "gazebo_ros/conversions/geometry_msgs.hpp"

diff --git a/gazebo_ros/include/gazebo_ros/conversions/geometry_msgs.hpp b/gazebo_ros/include/gazebo_ros/conversions/geometry_msgs.hpp
@@ -15,15 +15,16 @@
 #ifndef GAZEBO_ROS__CONVERSIONS__GEOMETRY_MSGS_HPP_
 #define GAZEBO_ROS__CONVERSIONS__GEOMETRY_MSGS_HPP_
 
+#include <ignition/math/Pose3.hh>
+#include <ignition/math/Quaternion.hh>
+#include <ignition/math/Vector3.hh>
+
 #include <geometry_msgs/msg/point.hpp>
 #include <geometry_msgs/msg/point32.hpp>
 #include <geometry_msgs/msg/pose.hpp>
 #include <geometry_msgs/msg/quaternion.hpp>
 #include <geometry_msgs/msg/transform.hpp>
 #include <geometry_msgs/msg/vector3.hpp>
-#include <ignition/math/Pose3.hh>
-#include <ignition/math/Quaternion.hh>
-#include <ignition/math/Vector3.hh>
 
 #include "gazebo_ros/conversions/generic.hpp"
 

diff --git a/gazebo_ros/include/gazebo_ros/conversions/sensor_msgs.hpp b/gazebo_ros/include/gazebo_ros/conversions/sensor_msgs.hpp
@@ -18,6 +18,10 @@
 #include <math.h>
 
 #include <gazebo/msgs/laserscan_stamped.pb.h>
+
+#include <algorithm>
+#include <limits>
+
 #include <geometry_msgs/msg/point32.hpp>
 #include <rclcpp/logging.hpp>
 #include <sensor_msgs/msg/point_cloud2.hpp>
@@ -26,9 +30,6 @@
 #include <sensor_msgs/msg/range.hpp>
 #include <sensor_msgs/point_cloud2_iterator.hpp>
 
-#include <algorithm>
-#include <limits>
-
 #include "gazebo_ros/conversions/builtin_interfaces.hpp"
 #include "gazebo_ros/conversions/generic.hpp"
 

diff --git a/gazebo_ros/include/gazebo_ros/executor.hpp b/gazebo_ros/include/gazebo_ros/executor.hpp
@@ -15,8 +15,8 @@
 #ifndef GAZEBO_ROS__EXECUTOR_HPP_
 #define GAZEBO_ROS__EXECUTOR_HPP_
 
-#include <rclcpp/rclcpp.hpp>
 #include <gazebo/common/Events.hh>
+#include <rclcpp/rclcpp.hpp>
 
 namespace gazebo_ros
 {

diff --git a/gazebo_ros/include/gazebo_ros/node.hpp b/gazebo_ros/include/gazebo_ros/node.hpp
@@ -15,11 +15,7 @@
 #ifndef GAZEBO_ROS__NODE_HPP_
 #define GAZEBO_ROS__NODE_HPP_
 
-#include <rclcpp/rclcpp.hpp>
-
-#include <gazebo_ros/executor.hpp>
 #include <gazebo_ros/node_visibility_control.h>
-#include <gazebo_ros/qos.hpp>
 
 #include <atomic>
 #include <memory>
@@ -28,6 +24,11 @@
 #include <utility>
 #include <vector>
 
+#include <gazebo_ros/executor.hpp>
+#include <gazebo_ros/qos.hpp>
+
+#include <rclcpp/rclcpp.hpp>
+
 namespace gazebo_ros
 {
 /// ROS Node for gazebo plugins

diff --git a/gazebo_ros/include/gazebo_ros/qos.hpp b/gazebo_ros/include/gazebo_ros/qos.hpp
@@ -15,18 +15,17 @@
 #ifndef GAZEBO_ROS__QOS_HPP_
 #define GAZEBO_ROS__QOS_HPP_
 
-#include <sdf/sdf.hh>
-
-#include <rclcpp/node_options.hpp>
-#include <rclcpp/qos.hpp>
-
 #include <gazebo_ros/node_visibility_control.h>
+#include <sdf/sdf.hh>
 
 #include <map>
 #include <memory>
 #include <stdexcept>
 #include <string>
 
+#include <rclcpp/node_options.hpp>
+#include <rclcpp/qos.hpp>
+
 namespace gazebo_ros
 {
 

diff --git a/gazebo_ros/include/gazebo_ros/testing_utils.hpp b/gazebo_ros/include/gazebo_ros/testing_utils.hpp
@@ -19,12 +19,13 @@
 #include <stdlib.h>
 
 #include <gtest/gtest.h>
-#include <rclcpp/rclcpp.hpp>
 
 #include <utility>
 #include <vector>
 #include <string>
 
+#include <rclcpp/rclcpp.hpp>
+
 namespace gazebo_ros
 {