From fae7e6421de748fbe3da0cdce3e3d2630e87b947 Mon Sep 17 00:00:00 2001
From: Louise Poubel <louise@openrobotics.org>
Date: Wed, 17 Aug 2022 14:37:43 -0700
Subject: [PATCH] Fix Windows and Doxygen (#1643)

Signed-off-by: Louise Poubel <louise@openrobotics.org>
---
 src/systems/elevator/Elevator.cc                              | 3 +--
 src/systems/elevator/Elevator.hh                              | 3 +--
 src/systems/elevator/ElevatorCommonPrivate.hh                 | 3 +--
 src/systems/elevator/ElevatorStateMachine.hh                  | 3 +--
 src/systems/elevator/state_machine/ActionsImpl.hh             | 3 +--
 .../elevator/state_machine/ElevatorStateMachineImpl.hh        | 3 +--
 src/systems/elevator/state_machine/EventsImpl.hh              | 3 +--
 src/systems/elevator/state_machine/GuardsImpl.hh              | 3 +--
 src/systems/elevator/state_machine/StatesImpl.hh              | 3 +--
 src/systems/elevator/utils/DoorTimer.cc                       | 3 +--
 src/systems/elevator/utils/DoorTimer.hh                       | 3 +--
 src/systems/elevator/utils/JointMonitor.cc                    | 3 +--
 src/systems/elevator/utils/JointMonitor.hh                    | 3 +--
 src/systems/optical_tactile_plugin/OpticalTactilePlugin.hh    | 3 +--
 src/systems/optical_tactile_plugin/Visualization.hh           | 3 +--
 src/systems/particle_emitter2/ParticleEmitter2.cc             | 4 ++--
 16 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/systems/elevator/Elevator.cc b/src/systems/elevator/Elevator.cc
index e36a8e240a..d077feddc3 100644
--- a/src/systems/elevator/Elevator.cc
+++ b/src/systems/elevator/Elevator.cc
@@ -55,8 +55,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 class ElevatorPrivate : public ElevatorCommonPrivate
diff --git a/src/systems/elevator/Elevator.hh b/src/systems/elevator/Elevator.hh
index 142f60792e..0fa6f0ea52 100644
--- a/src/systems/elevator/Elevator.hh
+++ b/src/systems/elevator/Elevator.hh
@@ -32,8 +32,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 // Data forward declaration
diff --git a/src/systems/elevator/ElevatorCommonPrivate.hh b/src/systems/elevator/ElevatorCommonPrivate.hh
index 5ccac6b7a4..a1852b5465 100644
--- a/src/systems/elevator/ElevatorCommonPrivate.hh
+++ b/src/systems/elevator/ElevatorCommonPrivate.hh
@@ -34,8 +34,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 class ElevatorCommonPrivate
diff --git a/src/systems/elevator/ElevatorStateMachine.hh b/src/systems/elevator/ElevatorStateMachine.hh
index 3eeaefd0e5..0084744189 100644
--- a/src/systems/elevator/ElevatorStateMachine.hh
+++ b/src/systems/elevator/ElevatorStateMachine.hh
@@ -35,8 +35,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 // Data forward declarations
diff --git a/src/systems/elevator/state_machine/ActionsImpl.hh b/src/systems/elevator/state_machine/ActionsImpl.hh
index 82c595a520..8b47f6426d 100644
--- a/src/systems/elevator/state_machine/ActionsImpl.hh
+++ b/src/systems/elevator/state_machine/ActionsImpl.hh
@@ -27,8 +27,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 namespace actions
diff --git a/src/systems/elevator/state_machine/ElevatorStateMachineImpl.hh b/src/systems/elevator/state_machine/ElevatorStateMachineImpl.hh
index a913173d44..f9439b5395 100644
--- a/src/systems/elevator/state_machine/ElevatorStateMachineImpl.hh
+++ b/src/systems/elevator/state_machine/ElevatorStateMachineImpl.hh
@@ -36,8 +36,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 class ElevatorStateMachinePrivate
diff --git a/src/systems/elevator/state_machine/EventsImpl.hh b/src/systems/elevator/state_machine/EventsImpl.hh
index 311af0adbc..4835fdb487 100644
--- a/src/systems/elevator/state_machine/EventsImpl.hh
+++ b/src/systems/elevator/state_machine/EventsImpl.hh
@@ -25,8 +25,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 namespace events
diff --git a/src/systems/elevator/state_machine/GuardsImpl.hh b/src/systems/elevator/state_machine/GuardsImpl.hh
index 21ba31f5f2..18c48a15f6 100644
--- a/src/systems/elevator/state_machine/GuardsImpl.hh
+++ b/src/systems/elevator/state_machine/GuardsImpl.hh
@@ -27,8 +27,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 namespace guards
diff --git a/src/systems/elevator/state_machine/StatesImpl.hh b/src/systems/elevator/state_machine/StatesImpl.hh
index 47d29acf93..d20f680e28 100644
--- a/src/systems/elevator/state_machine/StatesImpl.hh
+++ b/src/systems/elevator/state_machine/StatesImpl.hh
@@ -32,8 +32,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 /// \brief State at which the elevator is idling.
diff --git a/src/systems/elevator/utils/DoorTimer.cc b/src/systems/elevator/utils/DoorTimer.cc
index 587ba3cae4..36877be15c 100644
--- a/src/systems/elevator/utils/DoorTimer.cc
+++ b/src/systems/elevator/utils/DoorTimer.cc
@@ -29,8 +29,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 class DoorTimerPrivate
diff --git a/src/systems/elevator/utils/DoorTimer.hh b/src/systems/elevator/utils/DoorTimer.hh
index 50607f6887..6f1c5cd295 100644
--- a/src/systems/elevator/utils/DoorTimer.hh
+++ b/src/systems/elevator/utils/DoorTimer.hh
@@ -34,8 +34,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 // Data forward declaration
diff --git a/src/systems/elevator/utils/JointMonitor.cc b/src/systems/elevator/utils/JointMonitor.cc
index acf23cfaa4..cfeb86dedb 100644
--- a/src/systems/elevator/utils/JointMonitor.cc
+++ b/src/systems/elevator/utils/JointMonitor.cc
@@ -32,8 +32,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 class JointMonitorPrivate
diff --git a/src/systems/elevator/utils/JointMonitor.hh b/src/systems/elevator/utils/JointMonitor.hh
index b4940bedfc..4b3a8a5786 100644
--- a/src/systems/elevator/utils/JointMonitor.hh
+++ b/src/systems/elevator/utils/JointMonitor.hh
@@ -33,8 +33,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 // Data forward declaration
diff --git a/src/systems/optical_tactile_plugin/OpticalTactilePlugin.hh b/src/systems/optical_tactile_plugin/OpticalTactilePlugin.hh
index 3ffe1e2eec..664c109412 100644
--- a/src/systems/optical_tactile_plugin/OpticalTactilePlugin.hh
+++ b/src/systems/optical_tactile_plugin/OpticalTactilePlugin.hh
@@ -27,8 +27,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering.
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
   // Forward declaration
diff --git a/src/systems/optical_tactile_plugin/Visualization.hh b/src/systems/optical_tactile_plugin/Visualization.hh
index c692344bc3..0e9cc527e7 100644
--- a/src/systems/optical_tactile_plugin/Visualization.hh
+++ b/src/systems/optical_tactile_plugin/Visualization.hh
@@ -32,8 +32,7 @@ namespace gz
 namespace sim
 {
 // Inline bracket to help doxygen filtering.
-inline namespace GZ_SIM_VERSION_NAMESPACE
-{
+inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace systems
 {
 namespace optical_tactile_sensor
diff --git a/src/systems/particle_emitter2/ParticleEmitter2.cc b/src/systems/particle_emitter2/ParticleEmitter2.cc
index 1dfd1d69d9..ff86005ee2 100644
--- a/src/systems/particle_emitter2/ParticleEmitter2.cc
+++ b/src/systems/particle_emitter2/ParticleEmitter2.cc
@@ -158,7 +158,7 @@ void ParticleEmitter2::PreUpdate(const gz::sim::UpdateInfo &_info,
           // hack to avoid breaking the particle_emitter.proto message.
           if (_emitter->Data().has_header())
           {
-            for (const auto & data : _emitter->Data().header().data())
+            for (const auto &data : _emitter->Data().header().data())
             {
               if (data.key() == "topic" && !data.value().empty())
               {
@@ -218,7 +218,7 @@ void ParticleEmitter2::PreUpdate(const gz::sim::UpdateInfo &_info,
     return;
 
   // Process each command
-  for (const auto & cmd : this->dataPtr->userCmd)
+  for (const auto &cmd : this->dataPtr->userCmd)
   {
     // Create component.
     auto emitterComp = _ecm.Component<components::ParticleEmitterCmd>(