(fix) correct dllexport in windows

Author: Karsten1987

rclcpp_lifecycle/include/rcl_lifecycle/lifecycle_state.h

@@ -78,30 +78,39 @@ typedef struct LIFECYCLE_EXPORT _rcl_state_machine_t
  * @return the transition state which is valid
  * NULL if not available
  */
+LIFECYCLE_EXPORT
 const rcl_state_transition_t*
-LIFECYCLE_EXPORT rcl_is_valid_transition_by_index(rcl_state_machine_t* state_machine, unsigned int transition_index);
+rcl_is_valid_transition_by_index(rcl_state_machine_t* state_machine, unsigned int transition_index);
+LIFECYCLE_EXPORT
 const rcl_state_transition_t*
-LIFECYCLE_EXPORT rcl_is_valid_transition_by_label(rcl_state_machine_t* state_machine, const char* transition_label);
+rcl_is_valid_transition_by_label(rcl_state_machine_t* state_machine, const char* transition_label);
 
+LIFECYCLE_EXPORT
 const rcl_state_transition_t*
-LIFECYCLE_EXPORT rcl_get_registered_transition_by_index(rcl_state_machine_t* state_machine, unsigned int transition_state_index);
+rcl_get_registered_transition_by_index(rcl_state_machine_t* state_machine, unsigned int transition_state_index);
+LIFECYCLE_EXPORT
 const rcl_state_transition_t*
-LIFECYCLE_EXPORT rcl_get_registered_transition_by_label(rcl_state_machine_t* state_machine, const char* transition_state_label);
+rcl_get_registered_transition_by_label(rcl_state_machine_t* state_machine, const char* transition_state_label);
 
+LIFECYCLE_EXPORT
 rcl_state_t
-LIFECYCLE_EXPORT rcl_create_state(unsigned int state, char* label);
+rcl_create_state(unsigned int state, char* label);
 
+LIFECYCLE_EXPORT
 rcl_state_transition_t
-LIFECYCLE_EXPORT rcl_create_transition(rcl_state_t start, rcl_state_t goal);
+rcl_create_transition(rcl_state_t start, rcl_state_t goal);
 
+LIFECYCLE_EXPORT
 rcl_state_machine_t
-LIFECYCLE_EXPORT rcl_get_default_state_machine();
+rcl_get_default_state_machine();
 
+LIFECYCLE_EXPORT
 void
-LIFECYCLE_EXPORT rcl_register_callback(rcl_state_machine_t* state_machine, unsigned int state_index, unsigned int transition_index, bool(*fcn)(void));
+rcl_register_callback(rcl_state_machine_t* state_machine, unsigned int state_index, unsigned int transition_index, bool(*fcn)(void));
 
+LIFECYCLE_EXPORT
 bool
-LIFECYCLE_EXPORT rcl_invoke_transition(rcl_state_machine_t* state_machine, rcl_state_t transition_index);
+rcl_invoke_transition(rcl_state_machine_t* state_machine, rcl_state_t transition_index);
 
 #if __cplusplus
 }

rclcpp_lifecycle/include/rclcpp_lifecycle/lifecycle_manager.hpp

@@ -58,21 +58,18 @@ class LifecycleManagerInterface
   virtual bool deactivate(const std::string& node_name = "")  = 0;
 };
 
-class LifecycleManager : public LifecycleManagerInterface
+class LIFECYCLE_EXPORT LifecycleManager : public LifecycleManagerInterface
 {
 public:
   LifecycleManager();
   ~LifecycleManager();
 
-  LIFECYCLE_EXPORT
   void
   add_node_interface(const std::shared_ptr<node::lifecycle::LifecycleNodeInterface>& node_interface);
 
-  LIFECYCLE_EXPORT
   void
   add_node_interface(const std::shared_ptr<node::lifecycle::LifecycleNodeInterface>& node_interface, rcl_state_machine_t custom_state_machine);
 
-  LIFECYCLE_EXPORT
   template<typename T>
   bool
   register_on_configure(const std::string& node_name, bool(T::*method)(void), T* instance)
@@ -81,15 +78,12 @@ class LifecycleManager : public LifecycleManagerInterface
     return register_on_configure(node_name, cb);
   }
 
-  LIFECYCLE_EXPORT
   bool
   register_on_configure(const std::string& node_name, std::function<bool(void)>& fcn);
 
-  LIFECYCLE_EXPORT
   bool
   configure(const std::string& node_name = "");
 
-  LIFECYCLE_EXPORT
   template<typename T>
   bool
   register_on_cleanup(const std::string& node_name, bool(T::*method)(void), T* instance)
@@ -98,15 +92,12 @@ class LifecycleManager : public LifecycleManagerInterface
     return register_on_cleanup(node_name, cb);
   }
 
-  LIFECYCLE_EXPORT
   bool
   register_on_cleanup(const std::string& node_name, std::function<bool(void)>& fcn);
 
-  LIFECYCLE_EXPORT
   bool
   cleanup(const std::string& node_name = "");
 
-  LIFECYCLE_EXPORT
   template<typename T>
   bool
   register_on_shutdown(const std::string& node_name, bool(T::*method)(void), T* instance)
@@ -115,15 +106,12 @@ class LifecycleManager : public LifecycleManagerInterface
     return register_on_shutdown(node_name, cb);
   }
 
-  LIFECYCLE_EXPORT
   bool
   register_on_shutdown(const std::string& node_name, std::function<bool(void)>& fcn);
 
-  LIFECYCLE_EXPORT
   bool
   shutdown(const std::string& node_name = "");
 
-  LIFECYCLE_EXPORT
   template<typename T>
   bool
   register_on_activate(const std::string& node_name, bool(T::*method)(void), T* instance)
@@ -132,15 +120,12 @@ class LifecycleManager : public LifecycleManagerInterface
     return register_on_activate(node_name, cb);
   }
 
-  LIFECYCLE_EXPORT
   bool
   register_on_activate(const std::string& node_name, std::function<bool(void)>& fcn);
 
-  LIFECYCLE_EXPORT
   bool
   activate(const std::string& node_name = "");
 
-  LIFECYCLE_EXPORT
   template<typename T>
   bool
   register_on_deactivate(const std::string& node_name, bool(T::*method)(void), T* instance)
@@ -149,16 +134,14 @@ class LifecycleManager : public LifecycleManagerInterface
     return register_on_deactivate(node_name, cb);
   }
 
-  LIFECYCLE_EXPORT
   bool
   register_on_deactivate(const std::string& node_name, std::function<bool(void)>& fcn);
 
-  LIFECYCLE_EXPORT
   bool
   deactivate(const std::string& node_name = "");
 
 private:
-  class LifecycleManagerImpl;
+  class LIFECYCLE_EXPORT LifecycleManagerImpl;
   std::unique_ptr<LifecycleManagerImpl> impl_;
   //LifecycleManagerImpl* impl_;
 };

rclcpp_lifecycle/src/rclcpp_lifecycle/lifecycle_manager_impl.hpp

@@ -18,6 +18,10 @@
 #include <memory>
 #include <vector>
 #include <map>
+#include <functional>
+
+#include <rclcpp_lifecycle/lifecycle_node.hpp>
+#include <rclcpp_lifecycle/lifecycle_manager.hpp>
 
 #include <rcl_lifecycle/lifecycle_state.h>
 #include <rcl_lifecycle/default_state_machine.h>
@@ -27,8 +31,9 @@ namespace rclcpp
 namespace lifecycle
 {
 
-using NodeInterfacePtr = std::shared_ptr<node::lifecycle::LifecycleNodeInterface>;
-using NodeInterfaceWeakPtr = std::weak_ptr<node::lifecycle::LifecycleNodeInterface>;
+using NodeInterface = rclcpp::node::lifecycle::LifecycleNode;
+using NodeInterfacePtr = std::shared_ptr<rclcpp::node::lifecycle::LifecycleNodeInterface>;
+using NodeInterfaceWeakPtr = std::weak_ptr<rclcpp::node::lifecycle::LifecycleNodeInterface>;
 
 struct NodeStateMachine
 {
@@ -37,21 +42,19 @@ struct NodeStateMachine
   std::map<LifecycleTransitionsT, std::function<bool(void)>> cb_map;
 };
 
-class LifecycleManager::LifecycleManagerImpl
+class LIFECYCLE_EXPORT LifecycleManager::LifecycleManagerImpl
 {
 public:
   LifecycleManagerImpl() = default;
   ~LifecycleManagerImpl() = default;
 
-  LIFECYCLE_EXPORT
   void
   add_node_interface(const NodeInterfacePtr& node_interface)
   {
     rcl_state_machine_t state_machine = rcl_get_default_state_machine();
     add_node_interface(node_interface, state_machine);
   }
 
-  LIFECYCLE_EXPORT
   void
   add_node_interface(const NodeInterfacePtr& node_interface, rcl_state_machine_t custom_state_machine)
   {
@@ -62,7 +65,6 @@ class LifecycleManager::LifecycleManagerImpl
 
     // register default callbacks
     // maybe optional
-    using NodeInterface = node::lifecycle::LifecycleNodeInterface;
     std::function<bool(void)> cb_configuring = std::bind(&NodeInterface::on_configure, node_interface);
     std::function<bool(void)> cb_cleaningup = std::bind(&NodeInterface::on_cleanup, node_interface);
     std::function<bool(void)> cb_shuttingdown = std::bind(&NodeInterface::on_shutdown, node_interface);