consistent includes

ros2 · Jul 26, 2017 · c9e4ce4 · c9e4ce4
1 parent f5a75e2
commit c9e4ce4
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 35 deletions.
diff --git a/rcl_lifecycle/include/rcl_lifecycle/data_types.h b/rcl_lifecycle/include/rcl_lifecycle/data_types.h
@@ -15,7 +15,8 @@
 #ifndef RCL_LIFECYCLE__DATA_TYPES_H_
 #define RCL_LIFECYCLE__DATA_TYPES_H_
 
-#include <rcl/rcl.h>
+#include "rcl/rcl.h"
+
 #include "rcl_lifecycle/visibility_control.h"
 
 #if __cplusplus

diff --git a/rcl_lifecycle/include/rcl_lifecycle/rcl_lifecycle.h b/rcl_lifecycle/include/rcl_lifecycle/rcl_lifecycle.h
@@ -22,8 +22,8 @@ extern "C"
 
 #include <stdbool.h>
 
-#include <rcl_lifecycle/visibility_control.h>
-#include <rcl_lifecycle/data_types.h>
+#include "rcl_lifecycle/data_types.h"
+#include "rcl_lifecycle/visibility_control.h"
 
 RCL_LIFECYCLE_PUBLIC
 rcl_lifecycle_state_machine_t

diff --git a/rcl_lifecycle/include/rcl_lifecycle/transition_map.h b/rcl_lifecycle/include/rcl_lifecycle/transition_map.h
@@ -16,8 +16,9 @@
 #ifndef RCL_LIFECYCLE__TRANSITION_MAP_H_
 #define RCL_LIFECYCLE__TRANSITION_MAP_H_
 
-#include <rcl/macros.h>
-#include <rcl_lifecycle/data_types.h>
+#include "rcl/macros.h"
+
+#include "rcl_lifecycle/data_types.h"
 
 #if __cplusplus
 extern "C"

diff --git a/rcl_lifecycle/src/com_interface.c b/rcl_lifecycle/src/com_interface.c
@@ -22,21 +22,20 @@ extern "C"
 #include <stdio.h>
 #include <string.h>
 
-#include <rcl/error_handling.h>
+#include "lifecycle_msgs/msg/transition_event.h"
 
-#include <rcutils/format_string.h>
-#include <rcutils/logging_macros.h>
+#include "rcl/error_handling.h"
 
-#include <rmw/validate_full_topic_name.h>
+#include "rcutils/format_string.h"
+#include "rcutils/logging_macros.h"
 
-#include <rosidl_generator_c/message_type_support_struct.h>
-#include <rosidl_generator_c/string_functions.h>
+#include "rmw/validate_full_topic_name.h"
 
-#include <lifecycle_msgs/msg/transition_event.h>
+#include "rosidl_generator_c/message_type_support_struct.h"
+#include "rosidl_generator_c/string_functions.h"
 
 #include "rcl_lifecycle/data_types.h"
 
-
 static lifecycle_msgs__msg__TransitionEvent msg;
 static const char * pub_transition_event_suffix = "transition_event";
 static const char * srv_change_state_suffix = "change_state";

diff --git a/rcl_lifecycle/src/com_interface.h b/rcl_lifecycle/src/com_interface.h
@@ -20,7 +20,7 @@ extern "C"
 {
 #endif
 
-#include <rcl/macros.h>
+#include "rcl/macros.h"
 
 #include "rcl_lifecycle/data_types.h"
 

diff --git a/rcl_lifecycle/src/default_state_machine.c b/rcl_lifecycle/src/default_state_machine.c
@@ -16,12 +16,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <lifecycle_msgs/msg/state.h>
-#include <lifecycle_msgs/msg/transition.h>
+#include "lifecycle_msgs/msg/state.h"
+#include "lifecycle_msgs/msg/transition.h"
 
-#include "rcl_lifecycle/transition_map.h"
-#include "rcl/rcl.h"
 #include "rcl/error_handling.h"
+#include "rcl/rcl.h"
+
+#include "rcl_lifecycle/transition_map.h"
 
 #include "default_state_machine.h" // NOLINT
 #include "states.h" // NOLINT

diff --git a/rcl_lifecycle/src/default_state_machine.h b/rcl_lifecycle/src/default_state_machine.h
@@ -15,8 +15,8 @@
 #ifndef DEFAULT_STATE_MACHINE_H_
 #define DEFAULT_STATE_MACHINE_H_
 
-#include <rcl/macros.h>
-#include <rcl/types.h>
+#include "rcl/macros.h"
+#include "rcl/types.h"
 
 #include "rcl_lifecycle/data_types.h"
 #include "rcl_lifecycle/visibility_control.h"

diff --git a/rcl_lifecycle/src/rcl_lifecycle.c b/rcl_lifecycle/src/rcl_lifecycle.c
@@ -24,11 +24,11 @@ extern "C"
 #include "rcl/rcl.h"
 #include "rcl/error_handling.h"
 
+#include "rcutils/logging_macros.h"
+
 #include "rcl_lifecycle/rcl_lifecycle.h"
 #include "rcl_lifecycle/transition_map.h"
 
-#include "rcutils/logging_macros.h"
-
 #include "com_interface.h" // NOLINT
 #include "default_state_machine.h" // NOLINT
 #include "states.h" // NOLINT

diff --git a/rcl_lifecycle/src/states.h b/rcl_lifecycle/src/states.h
@@ -15,8 +15,8 @@
 #ifndef STATES_H_
 #define STATES_H_
 
-#include <rcl_lifecycle/visibility_control.h>
-#include <rcl_lifecycle/data_types.h>
+#include "rcl_lifecycle/data_types.h"
+#include "rcl_lifecycle/visibility_control.h"
 
 #if __cplusplus
 extern "C"

diff --git a/rcl_lifecycle/src/transition_map.c b/rcl_lifecycle/src/transition_map.c
@@ -21,10 +21,11 @@ extern "C"
 #include <stdlib.h>
 #include <string.h>
 
-#include "rcl_lifecycle/transition_map.h"
 #include "rcl/error_handling.h"
 #include "rcutils/format_string.h"
 
+#include "rcl_lifecycle/transition_map.h"
+
 rcl_lifecycle_transition_map_t
 rcl_lifecycle_get_zero_initialized_transition_map()
 {

diff --git a/rcl_lifecycle/test/test_default_state_machine.cpp b/rcl_lifecycle/test/test_default_state_machine.cpp
@@ -17,19 +17,18 @@
 // as depicted in design.ros2.org
 
 #include <gtest/gtest.h>
-
-#include <lifecycle_msgs/msg/state.h>
-#include <lifecycle_msgs/msg/transition.h>
-
 #include <vector>
 
+#include "lifecycle_msgs/msg/state.h"
+#include "lifecycle_msgs/msg/transition.h"
+
 #include "rcl/error_handling.h"
 #include "rcl/rcl.h"
 
-#include "rcl_lifecycle/rcl_lifecycle.h"
-
 #include "rcutils/logging_macros.h"
 
+#include "rcl_lifecycle/rcl_lifecycle.h"
+
 #include "../src/default_state_machine.h"
 
 class TestDefaultStateMachine : public ::testing::Test

diff --git a/rcl_lifecycle/test/test_multiple_instances.cpp b/rcl_lifecycle/test/test_multiple_instances.cpp
@@ -17,16 +17,16 @@
 // as depicted in design.ros2.org
 
 #include <gtest/gtest.h>
-
-#include <lifecycle_msgs/msg/state.h>
-#include <lifecycle_msgs/msg/transition.h>
-
 #include <vector>
 
+#include "lifecycle_msgs/msg/state.h"
+#include "lifecycle_msgs/msg/transition.h"
+
 #include "rcl/error_handling.h"
 #include "rcl/rcl.h"
 
 #include "rcl_lifecycle/rcl_lifecycle.h"
+
 #include "../src/default_state_machine.h"
 
 class TestMultipleInstances : public ::testing::Test

diff --git a/rcl_lifecycle/test/test_transition_map.cpp b/rcl_lifecycle/test/test_transition_map.cpp
@@ -19,6 +19,7 @@
 #include <gtest/gtest.h>
 
 #include "rcl/error_handling.h"
+
 #include "rcl_lifecycle/transition_map.h"
 
 class TestTransitionMap : public ::testing::Test