remove rebase artefacts

Author: mamueluth

hardware_interface/include/hardware_interface/actuator_interface.hpp

@@ -482,17 +482,16 @@ class ActuatorInterface : public rclcpp_lifecycle::node_interfaces::LifecycleNod
   std::unordered_map<std::string, InterfaceDescription> unlisted_command_interfaces_;
 
 private:
+  std::unordered_map<std::string, std::shared_ptr<StateInterface>> actuator_states_;
+  std::unordered_map<std::string, std::shared_ptr<CommandInterface>> actuator_commands_;
+
   std::shared_ptr<StateInterface> emergency_stop_;
   std::shared_ptr<StateInterface> error_signal_;
   std::shared_ptr<StateInterface> error_signal_message_;
   std::shared_ptr<StateInterface> warning_signal_;
   std::shared_ptr<StateInterface> warning_signal_message_;
 
   rclcpp_lifecycle::State lifecycle_state_;
-
-private:
-  std::unordered_map<std::string, std::shared_ptr<StateInterface>> actuator_states_;
-  std::unordered_map<std::string, std::shared_ptr<CommandInterface>> actuator_commands_;
 };
 
 }  // namespace hardware_interface

hardware_interface/include/hardware_interface/sensor_interface.hpp

@@ -314,15 +314,14 @@ class SensorInterface : public rclcpp_lifecycle::node_interfaces::LifecycleNodeI
   std::unordered_map<std::string, InterfaceDescription> unlisted_state_interfaces_;
 
 private:
+  std::unordered_map<std::string, std::shared_ptr<StateInterface>> sensor_states_;
+
   std::shared_ptr<StateInterface> error_signal_;
   std::shared_ptr<StateInterface> error_signal_message_;
   std::shared_ptr<StateInterface> warning_signal_;
   std::shared_ptr<StateInterface> warning_signal_message_;
 
   rclcpp_lifecycle::State lifecycle_state_;
-
-private:
-  std::unordered_map<std::string, std::shared_ptr<StateInterface>> sensor_states_;
 };
 
 }  // namespace hardware_interface

hardware_interface/include/hardware_interface/system_interface.hpp

@@ -527,17 +527,16 @@ class SystemInterface : public rclcpp_lifecycle::node_interfaces::LifecycleNodeI
   std::unordered_map<std::string, InterfaceDescription> unlisted_command_interfaces_;
 
 private:
+  std::unordered_map<std::string, std::shared_ptr<StateInterface>> system_states_;
+  std::unordered_map<std::string, std::shared_ptr<CommandInterface>> system_commands_;
+
   std::shared_ptr<StateInterface> emergency_stop_;
   std::shared_ptr<StateInterface> error_signal_;
   std::shared_ptr<StateInterface> error_signal_message_;
   std::shared_ptr<StateInterface> warning_signal_;
   std::shared_ptr<StateInterface> warning_signal_message_;
 
   rclcpp_lifecycle::State lifecycle_state_;
-
-private:
-  std::unordered_map<std::string, std::shared_ptr<StateInterface>> system_states_;
-  std::unordered_map<std::string, std::shared_ptr<CommandInterface>> system_commands_;
 };
 
 }  // namespace hardware_interface