Skip to content

Commit

Permalink
Fix Windows and Doxygen (gazebosim#1643)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina committed Aug 30, 2022
1 parent 31a2423 commit fae7e64
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 32 deletions.
3 changes: 1 addition & 2 deletions src/systems/elevator/Elevator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/Elevator.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/ElevatorCommonPrivate.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/ElevatorStateMachine.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/state_machine/ActionsImpl.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/state_machine/EventsImpl.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/state_machine/GuardsImpl.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/state_machine/StatesImpl.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/utils/DoorTimer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/utils/DoorTimer.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/utils/JointMonitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/utils/JointMonitor.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/optical_tactile_plugin/OpticalTactilePlugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/systems/optical_tactile_plugin/Visualization.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/systems/particle_emitter2/ParticleEmitter2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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())
{
Expand Down Expand Up @@ -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>(
Expand Down

0 comments on commit fae7e64

Please sign in to comment.