From c27990a655cf41be34afc58b56a0d20b03008873 Mon Sep 17 00:00:00 2001
From: Manuel M <mamueluth@gmail.com>
Date: Thu, 1 Feb 2024 10:54:13 +0100
Subject: [PATCH] remove rebase artefacts

---
 .../include/hardware_interface/actuator_interface.hpp      | 7 +++----
 .../include/hardware_interface/sensor_interface.hpp        | 5 ++---
 .../include/hardware_interface/system_interface.hpp        | 7 +++----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/hardware_interface/include/hardware_interface/actuator_interface.hpp b/hardware_interface/include/hardware_interface/actuator_interface.hpp
index 1bb07ae29e..67731f67d5 100644
--- a/hardware_interface/include/hardware_interface/actuator_interface.hpp
+++ b/hardware_interface/include/hardware_interface/actuator_interface.hpp
@@ -482,6 +482,9 @@ 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_;
@@ -489,10 +492,6 @@ class ActuatorInterface : public rclcpp_lifecycle::node_interfaces::LifecycleNod
   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
diff --git a/hardware_interface/include/hardware_interface/sensor_interface.hpp b/hardware_interface/include/hardware_interface/sensor_interface.hpp
index 2718028002..47355560f5 100644
--- a/hardware_interface/include/hardware_interface/sensor_interface.hpp
+++ b/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
diff --git a/hardware_interface/include/hardware_interface/system_interface.hpp b/hardware_interface/include/hardware_interface/system_interface.hpp
index c7884835f5..3b55435ee3 100644
--- a/hardware_interface/include/hardware_interface/system_interface.hpp
+++ b/hardware_interface/include/hardware_interface/system_interface.hpp
@@ -527,6 +527,9 @@ 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_;
@@ -534,10 +537,6 @@ class SystemInterface : public rclcpp_lifecycle::node_interfaces::LifecycleNodeI
   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