Skip to content

Fix Windows and Doxygen #1643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 17, 2022
Merged

Fix Windows and Doxygen #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c0118a
Fix Windows and Doxygen
chapulina Aug 11, 2022
b2afaa1
Disable tests on Windows
chapulina Aug 11, 2022
55b554d
ignition
chapulina Aug 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/LevelManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
#include "ignition/gazebo/components/Geometry.hh"
#include "ignition/gazebo/components/Gravity.hh"
#include "ignition/gazebo/components/Level.hh"
#include "ignition/gazebo/components/Model.hh"
#include "ignition/gazebo/components/Light.hh"
#include "ignition/gazebo/components/Name.hh"
#include "ignition/gazebo/components/LevelBuffer.hh"
#include "ignition/gazebo/components/LevelEntityNames.hh"
#include "ignition/gazebo/components/Light.hh"
#include "ignition/gazebo/components/LinearVelocity.hh"
#include "ignition/gazebo/components/LinearVelocitySeed.hh"
#include "ignition/gazebo/components/MagneticField.hh"
#include "ignition/gazebo/components/Model.hh"
#include "ignition/gazebo/components/Name.hh"
#include "ignition/gazebo/components/ParentEntity.hh"
#include "ignition/gazebo/components/Performer.hh"
#include "ignition/gazebo/components/PerformerLevels.hh"
Expand Down
8 changes: 4 additions & 4 deletions src/gui/QuickStartHandler.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <QtCore>
#include <string>

#include "ignition/gazebo/Export.hh"
#include "ignition/gazebo/config.hh"
#include "ignition/gazebo/gui/Export.hh"

namespace ignition
{
Expand All @@ -32,7 +32,7 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace gui
{
/// \brief Class for handling quick start dialog
class QuickStartHandler : public QObject
class IGNITION_GAZEBO_GUI_VISIBLE QuickStartHandler : public QObject
{
Q_OBJECT

Expand All @@ -44,8 +44,8 @@ class QuickStartHandler : public QObject
/// \return Distribution name, such as 'Citadel'
public: Q_INVOKABLE QString Distribution() const;

/// \brief Get Gazebo version
/// \return gazebo version
/// \brief Get Gazebo Sim version
/// \return Version
public: Q_INVOKABLE QString SimVersion() const;

/// \brief Set starting world
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/Elevator.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace systems
{
// Data forward declaration
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/ElevatorCommonPrivate.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace systems
{
class ElevatorCommonPrivate
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/ElevatorStateMachine.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace systems
{
// Data forward declarations
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/state_machine/ActionsImpl.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace systems
{
namespace actions
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/state_machine/ElevatorStateMachineImpl.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace systems
{
class ElevatorStateMachinePrivate
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/state_machine/EventsImpl.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace systems
{
namespace events
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/state_machine/GuardsImpl.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace systems
{
namespace guards
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/state_machine/StatesImpl.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_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.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace systems
{
// Data forward declaration
Expand Down
3 changes: 1 addition & 2 deletions src/systems/elevator/utils/JointMonitor.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace systems
{
// Data forward declaration
Expand Down
3 changes: 1 addition & 2 deletions src/systems/optical_tactile_plugin/OpticalTactilePlugin.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering.
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace systems
{
// Forward declaration
Expand Down
3 changes: 1 addition & 2 deletions src/systems/optical_tactile_plugin/Visualization.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ namespace ignition
namespace gazebo
{
// Inline bracket to help doxygen filtering.
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
{
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
namespace systems
{
namespace optical_tactile_sensor
Expand Down
4 changes: 2 additions & 2 deletions src/systems/particle_emitter2/ParticleEmitter2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void ParticleEmitter2::PreUpdate(const ignition::gazebo::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 ignition::gazebo::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
9 changes: 6 additions & 3 deletions test/integration/apply_link_wrench_system.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <ignition/common/Console.hh>
#include <ignition/common/Util.hh>
#include <ignition/transport/Node.hh>
#include <ignition/utils/ExtraTestMacros.hh>

#include "ignition/gazebo/components/Model.hh"
#include "ignition/gazebo/components/Name.hh"
Expand All @@ -48,7 +49,7 @@ class ApplyLinkWrenchTestFixture : public InternalFixture<::testing::Test>
};

/////////////////////////////////////////////////
TEST_F(ApplyLinkWrenchTestFixture, FromSdf)
TEST_F(ApplyLinkWrenchTestFixture, IGN_UTILS_TEST_DISABLED_ON_WIN32(FromSdf))
{
TestFixture fixture(common::joinPaths(std::string(PROJECT_SOURCE_PATH),
"test", "worlds", "apply_link_wrench.sdf"));
Expand Down Expand Up @@ -106,7 +107,8 @@ TEST_F(ApplyLinkWrenchTestFixture, FromSdf)
}

/////////////////////////////////////////////////
TEST_F(ApplyLinkWrenchTestFixture, PersistentFromTopic)
TEST_F(ApplyLinkWrenchTestFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(PersistentFromTopic))
{
TestFixture fixture(common::joinPaths(std::string(PROJECT_SOURCE_PATH),
"test", "worlds", "apply_link_wrench.sdf"));
Expand Down Expand Up @@ -240,7 +242,8 @@ TEST_F(ApplyLinkWrenchTestFixture, PersistentFromTopic)
}

/////////////////////////////////////////////////
TEST_F(ApplyLinkWrenchTestFixture, InstantaneousFromTopic)
TEST_F(ApplyLinkWrenchTestFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(InstantaneousFromTopic))
{
TestFixture fixture(common::joinPaths(std::string(PROJECT_SOURCE_PATH),
"test", "worlds", "apply_link_wrench.sdf"));
Expand Down