From 23a77289aaf419c1d4370f53695d05b9a53b5798 Mon Sep 17 00:00:00 2001 From: William Woodall Date: Fri, 9 Dec 2016 15:07:55 -0800 Subject: [PATCH] fix include orders --- rclcpp/src/rclcpp/node_interfaces/node_graph.cpp | 4 ++-- rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp | 4 ++-- rclcpp/src/rclcpp/node_interfaces/node_services.cpp | 4 ++-- rclcpp/src/rclcpp/node_interfaces/node_timers.cpp | 4 ++-- rclcpp/src/rclcpp/node_interfaces/node_topics.cpp | 4 ++-- rclcpp/src/rclcpp/parameter_service.cpp | 1 + 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp b/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp index f688da55ac..693ab49b13 100644 --- a/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp +++ b/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "rclcpp/node_interfaces/node_graph.hpp" + #include #include -#include "rclcpp/node_interfaces/node_graph.hpp" - #include "rcl/graph.h" #include "rclcpp/exceptions.hpp" #include "rclcpp/event.hpp" diff --git a/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp b/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp index 0e29933dc0..2d0016f316 100644 --- a/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp +++ b/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "rclcpp/node_interfaces/node_parameters.hpp" + #include #include #include #include #include -#include "rclcpp/node_interfaces/node_parameters.hpp" - #include "rcl_interfaces/srv/list_parameters.hpp" #include "rclcpp/create_publisher.hpp" #include "rmw/qos_profiles.h" diff --git a/rclcpp/src/rclcpp/node_interfaces/node_services.cpp b/rclcpp/src/rclcpp/node_interfaces/node_services.cpp index eae2fed0d5..196404fd75 100644 --- a/rclcpp/src/rclcpp/node_interfaces/node_services.cpp +++ b/rclcpp/src/rclcpp/node_interfaces/node_services.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "rclcpp/node_interfaces/node_services.hpp" +#include + using rclcpp::node_interfaces::NodeServices; NodeServices::NodeServices(rclcpp::node_interfaces::NodeBaseInterface * node_base) diff --git a/rclcpp/src/rclcpp/node_interfaces/node_timers.cpp b/rclcpp/src/rclcpp/node_interfaces/node_timers.cpp index c1c063ce32..b7176dc3f6 100644 --- a/rclcpp/src/rclcpp/node_interfaces/node_timers.cpp +++ b/rclcpp/src/rclcpp/node_interfaces/node_timers.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "rclcpp/node_interfaces/node_timers.hpp" +#include + using rclcpp::node_interfaces::NodeTimers; NodeTimers::NodeTimers(rclcpp::node_interfaces::NodeBaseInterface * node_base) diff --git a/rclcpp/src/rclcpp/node_interfaces/node_topics.cpp b/rclcpp/src/rclcpp/node_interfaces/node_topics.cpp index bc2b83b2ed..857a71cbe6 100644 --- a/rclcpp/src/rclcpp/node_interfaces/node_topics.cpp +++ b/rclcpp/src/rclcpp/node_interfaces/node_topics.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "rclcpp/node_interfaces/node_topics.hpp" + #include #include "rclcpp/intra_process_manager.hpp" -#include "rclcpp/node_interfaces/node_topics.hpp" - #include "rclcpp/exceptions.hpp" using rclcpp::exceptions::throw_from_rcl_error; diff --git a/rclcpp/src/rclcpp/parameter_service.cpp b/rclcpp/src/rclcpp/parameter_service.cpp index ffe50017cc..659ea2624f 100644 --- a/rclcpp/src/rclcpp/parameter_service.cpp +++ b/rclcpp/src/rclcpp/parameter_service.cpp @@ -16,6 +16,7 @@ #include #include +#include #include using rclcpp::parameter_service::ParameterService;