From 4654ee5c55d994b45f0e491139790442ffa19a64 Mon Sep 17 00:00:00 2001 From: Michel Hidalgo Date: Tue, 28 Sep 2021 12:14:17 -0300 Subject: [PATCH 1/2] Update forward declarations of rcl_lifecycle types Signed-off-by: Michel Hidalgo --- rclcpp_lifecycle/include/rclcpp_lifecycle/state.hpp | 4 ++-- rclcpp_lifecycle/include/rclcpp_lifecycle/transition.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rclcpp_lifecycle/include/rclcpp_lifecycle/state.hpp b/rclcpp_lifecycle/include/rclcpp_lifecycle/state.hpp index f09e390395..2ae8fb2a7c 100644 --- a/rclcpp_lifecycle/include/rclcpp_lifecycle/state.hpp +++ b/rclcpp_lifecycle/include/rclcpp_lifecycle/state.hpp @@ -21,8 +21,8 @@ #include "rcutils/allocator.h" -// forward declare rcl_state_t -typedef struct rcl_lifecycle_state_t rcl_lifecycle_state_t; +// forward declare rcl_lifecycle_state_t +typedef struct rcl_lifecycle_state_s rcl_lifecycle_state_t; namespace rclcpp_lifecycle { diff --git a/rclcpp_lifecycle/include/rclcpp_lifecycle/transition.hpp b/rclcpp_lifecycle/include/rclcpp_lifecycle/transition.hpp index e15ccce7e2..dfc1281d96 100644 --- a/rclcpp_lifecycle/include/rclcpp_lifecycle/transition.hpp +++ b/rclcpp_lifecycle/include/rclcpp_lifecycle/transition.hpp @@ -22,8 +22,8 @@ #include "rcutils/allocator.h" -// forward declare rcl_transition_t -typedef struct rcl_lifecycle_transition_t rcl_lifecycle_transition_t; +// forward declare rcl_lifecycle_transition_t +typedef struct rcl_lifecycle_transition_s rcl_lifecycle_transition_t; namespace rclcpp_lifecycle { From d1fb7db56e8e6cc43c9f0a9cd675997bee8aa690 Mon Sep 17 00:00:00 2001 From: Michel Hidalgo Date: Tue, 28 Sep 2021 19:01:58 -0300 Subject: [PATCH 2/2] Include rcl_lifecycle and drop forward declarations Signed-off-by: Michel Hidalgo --- rclcpp_lifecycle/include/rclcpp_lifecycle/state.hpp | 4 +--- rclcpp_lifecycle/include/rclcpp_lifecycle/transition.hpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/rclcpp_lifecycle/include/rclcpp_lifecycle/state.hpp b/rclcpp_lifecycle/include/rclcpp_lifecycle/state.hpp index 2ae8fb2a7c..a0ac997ff3 100644 --- a/rclcpp_lifecycle/include/rclcpp_lifecycle/state.hpp +++ b/rclcpp_lifecycle/include/rclcpp_lifecycle/state.hpp @@ -17,13 +17,11 @@ #include +#include "rcl_lifecycle/data_types.h" #include "rclcpp_lifecycle/visibility_control.h" #include "rcutils/allocator.h" -// forward declare rcl_lifecycle_state_t -typedef struct rcl_lifecycle_state_s rcl_lifecycle_state_t; - namespace rclcpp_lifecycle { diff --git a/rclcpp_lifecycle/include/rclcpp_lifecycle/transition.hpp b/rclcpp_lifecycle/include/rclcpp_lifecycle/transition.hpp index dfc1281d96..874be69aa6 100644 --- a/rclcpp_lifecycle/include/rclcpp_lifecycle/transition.hpp +++ b/rclcpp_lifecycle/include/rclcpp_lifecycle/transition.hpp @@ -17,14 +17,12 @@ #include +#include "rcl_lifecycle/data_types.h" #include "rclcpp_lifecycle/state.hpp" #include "rclcpp_lifecycle/visibility_control.h" #include "rcutils/allocator.h" -// forward declare rcl_lifecycle_transition_t -typedef struct rcl_lifecycle_transition_s rcl_lifecycle_transition_t; - namespace rclcpp_lifecycle {