diff --git a/include/ignition/gazebo/gui/Gui.hh b/include/ignition/gazebo/gui/Gui.hh index 377d36e2f8..e23f99cfea 100644 --- a/include/ignition/gazebo/gui/Gui.hh +++ b/include/ignition/gazebo/gui/Gui.hh @@ -22,7 +22,7 @@ #include #include "ignition/gazebo/config.hh" -#include "ignition/gazebo/Export.hh" +#include "ignition/gazebo/gui/Export.hh" namespace ignition { @@ -41,7 +41,7 @@ namespace gui /// ign-tools. Set to the name of the application if using ign-tools) /// \param[in] _guiConfig The GUI configuration file. If nullptr, the default /// configuration from IGN_HOMEDIR/.ignition/gazebo/gui.config will be used. - IGNITION_GAZEBO_VISIBLE int runGui(int &_argc, char **_argv, + IGNITION_GAZEBO_GUI_VISIBLE int runGui(int &_argc, char **_argv, const char *_guiConfig); /// \brief Create a Gazebo GUI application @@ -60,7 +60,8 @@ namespace gui /// IGN_HOMEDIR/.ignition/gazebo/gui.config will be used. /// \param[in] _loadPluginsFromSdf If true, plugins specified in the world /// SDFormat file will get loaded. - IGNITION_GAZEBO_VISIBLE std::unique_ptr createGui( + IGNITION_GAZEBO_GUI_VISIBLE + std::unique_ptr createGui( int &_argc, char **_argv, const char *_guiConfig, const char *_defaultGuiConfig = nullptr, bool _loadPluginsFromSdf = true); diff --git a/include/ignition/gazebo/gui/GuiRunner.hh b/include/ignition/gazebo/gui/GuiRunner.hh index 421f49e47b..85520e0446 100644 --- a/include/ignition/gazebo/gui/GuiRunner.hh +++ b/include/ignition/gazebo/gui/GuiRunner.hh @@ -27,7 +27,7 @@ #include #include "ignition/gazebo/EntityComponentManager.hh" -#include "ignition/gazebo/Export.hh" +#include "ignition/gazebo/gui/Export.hh" namespace ignition { @@ -37,7 +37,7 @@ namespace gazebo inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE { /// \brief Responsible for running GUI systems as new states are received from /// the backend. -class IGNITION_GAZEBO_VISIBLE GuiRunner : public QObject +class IGNITION_GAZEBO_GUI_VISIBLE GuiRunner : public QObject { Q_OBJECT diff --git a/include/ignition/gazebo/rendering/MarkerManager.hh b/include/ignition/gazebo/rendering/MarkerManager.hh index ff9d3d43e4..691d08fdbc 100644 --- a/include/ignition/gazebo/rendering/MarkerManager.hh +++ b/include/ignition/gazebo/rendering/MarkerManager.hh @@ -20,6 +20,8 @@ #include #include +#include + #include "ignition/rendering/RenderTypes.hh" namespace ignition @@ -32,7 +34,7 @@ class MarkerManagerPrivate; /// \brief Creates, deletes, and maintains marker visuals. Only the /// Scene class should instantiate and use this class. -class IGNITION_GAZEBO_VISIBLE MarkerManager +class IGNITION_GAZEBO_RENDERING_VISIBLE MarkerManager { /// \brief Constructor public: MarkerManager(); diff --git a/include/ignition/gazebo/rendering/RenderUtil.hh b/include/ignition/gazebo/rendering/RenderUtil.hh index 92d191576a..6e8e82f98e 100644 --- a/include/ignition/gazebo/rendering/RenderUtil.hh +++ b/include/ignition/gazebo/rendering/RenderUtil.hh @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "ignition/gazebo/rendering/SceneManager.hh" @@ -41,7 +41,7 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE { class RenderUtilPrivate; /// \class RenderUtil RenderUtil.hh ignition/gazebo/gui/plugins/RenderUtil.hh - class IGNITION_GAZEBO_VISIBLE RenderUtil + class IGNITION_GAZEBO_RENDERING_VISIBLE RenderUtil { /// \brief Constructor public: explicit RenderUtil(); diff --git a/include/ignition/gazebo/rendering/SceneManager.hh b/include/ignition/gazebo/rendering/SceneManager.hh index 2099ef7b0f..162a307b96 100644 --- a/include/ignition/gazebo/rendering/SceneManager.hh +++ b/include/ignition/gazebo/rendering/SceneManager.hh @@ -36,7 +36,7 @@ #include #include -#include +#include namespace ignition { @@ -48,7 +48,7 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE { class SceneManagerPrivate; /// \brief Scene manager class for loading and managing objects in the scene - class IGNITION_GAZEBO_VISIBLE SceneManager + class IGNITION_GAZEBO_RENDERING_VISIBLE SceneManager { /// \brief Constructor public: SceneManager(); diff --git a/src/systems/air_pressure/AirPressure.hh b/src/systems/air_pressure/AirPressure.hh index 68be696d37..93cbb5fd4a 100644 --- a/src/systems/air_pressure/AirPressure.hh +++ b/src/systems/air_pressure/AirPressure.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/altimeter/Altimeter.hh b/src/systems/altimeter/Altimeter.hh index aede9336e0..e044e9b864 100644 --- a/src/systems/altimeter/Altimeter.hh +++ b/src/systems/altimeter/Altimeter.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/breadcrumbs/Breadcrumbs.hh b/src/systems/breadcrumbs/Breadcrumbs.hh index fb874c0272..e57be62402 100644 --- a/src/systems/breadcrumbs/Breadcrumbs.hh +++ b/src/systems/breadcrumbs/Breadcrumbs.hh @@ -18,6 +18,7 @@ #define IGNITION_GAZEBO_SYSTEMS_BREADCRUMBS_HH_ #include +#include #include #include #include diff --git a/src/systems/camera_video_recorder/CameraVideoRecorder.hh b/src/systems/camera_video_recorder/CameraVideoRecorder.hh index b8627f7355..a7204e5a80 100644 --- a/src/systems/camera_video_recorder/CameraVideoRecorder.hh +++ b/src/systems/camera_video_recorder/CameraVideoRecorder.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/contact/Contact.hh b/src/systems/contact/Contact.hh index 98d77f4258..73e90b811e 100644 --- a/src/systems/contact/Contact.hh +++ b/src/systems/contact/Contact.hh @@ -18,7 +18,6 @@ #define IGNITION_GAZEBO_SYSTEMS_CONTACT_HH_ #include -#include #include namespace ignition diff --git a/src/systems/imu/Imu.hh b/src/systems/imu/Imu.hh index 74d5d87750..6194c4ec99 100644 --- a/src/systems/imu/Imu.hh +++ b/src/systems/imu/Imu.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/log/LogPlayback.hh b/src/systems/log/LogPlayback.hh index 90e41cb3c0..07086f63c9 100644 --- a/src/systems/log/LogPlayback.hh +++ b/src/systems/log/LogPlayback.hh @@ -20,7 +20,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/log/LogRecord.hh b/src/systems/log/LogRecord.hh index 6bf80578e8..f03edd4e35 100644 --- a/src/systems/log/LogRecord.hh +++ b/src/systems/log/LogRecord.hh @@ -20,7 +20,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/log_video_recorder/LogVideoRecorder.hh b/src/systems/log_video_recorder/LogVideoRecorder.hh index e8d54fb3f3..7c2a87fc5e 100644 --- a/src/systems/log_video_recorder/LogVideoRecorder.hh +++ b/src/systems/log_video_recorder/LogVideoRecorder.hh @@ -20,7 +20,6 @@ #include #include #include -#include #include namespace ignition diff --git a/src/systems/logical_camera/LogicalCamera.hh b/src/systems/logical_camera/LogicalCamera.hh index bb17adaa32..8d2ab28e38 100644 --- a/src/systems/logical_camera/LogicalCamera.hh +++ b/src/systems/logical_camera/LogicalCamera.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/magnetometer/Magnetometer.hh b/src/systems/magnetometer/Magnetometer.hh index cda2e5e970..5294fe96ee 100644 --- a/src/systems/magnetometer/Magnetometer.hh +++ b/src/systems/magnetometer/Magnetometer.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/multicopter_control/Common.hh b/src/systems/multicopter_control/Common.hh index 4d3fdee009..d0e41f7689 100644 --- a/src/systems/multicopter_control/Common.hh +++ b/src/systems/multicopter_control/Common.hh @@ -19,6 +19,7 @@ #define IGNITION_GAZEBO_SYSTEMS_MULTICOPTERVELOCITYCONTROL_COMMON_HH_ #include +#include #include #include diff --git a/src/systems/physics/Physics.hh b/src/systems/physics/Physics.hh index cc39d373a0..38f7f10599 100644 --- a/src/systems/physics/Physics.hh +++ b/src/systems/physics/Physics.hh @@ -46,7 +46,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/pose_publisher/PosePublisher.hh b/src/systems/pose_publisher/PosePublisher.hh index 21ceed3a6f..abd794ea25 100644 --- a/src/systems/pose_publisher/PosePublisher.hh +++ b/src/systems/pose_publisher/PosePublisher.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/scene_broadcaster/SceneBroadcaster.hh b/src/systems/scene_broadcaster/SceneBroadcaster.hh index 5a23d01d9c..aced8c4bfe 100644 --- a/src/systems/scene_broadcaster/SceneBroadcaster.hh +++ b/src/systems/scene_broadcaster/SceneBroadcaster.hh @@ -20,7 +20,6 @@ #include #include #include -#include #include namespace ignition diff --git a/src/systems/sensors/Sensors.hh b/src/systems/sensors/Sensors.hh index 3461256bbc..1e0602644e 100644 --- a/src/systems/sensors/Sensors.hh +++ b/src/systems/sensors/Sensors.hh @@ -21,7 +21,6 @@ #include #include -#include #include #include diff --git a/src/systems/thermal/Thermal.hh b/src/systems/thermal/Thermal.hh index e033a21fbc..9210a06a0f 100644 --- a/src/systems/thermal/Thermal.hh +++ b/src/systems/thermal/Thermal.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/triggered_publisher/TriggeredPublisher.cc b/src/systems/triggered_publisher/TriggeredPublisher.cc index ddbcb58de7..316177f2d4 100644 --- a/src/systems/triggered_publisher/TriggeredPublisher.cc +++ b/src/systems/triggered_publisher/TriggeredPublisher.cc @@ -17,6 +17,7 @@ #include "TriggeredPublisher.hh" +#include #include #include @@ -27,6 +28,11 @@ #include #include +// bug https://github.com/protocolbuffers/protobuf/issues/5051 +#ifdef _WIN32 +#undef GetMessage +#endif + using namespace ignition; using namespace gazebo; using namespace systems; diff --git a/src/systems/triggered_publisher/TriggeredPublisher.hh b/src/systems/triggered_publisher/TriggeredPublisher.hh index 2834d5399a..1fb7d61050 100644 --- a/src/systems/triggered_publisher/TriggeredPublisher.hh +++ b/src/systems/triggered_publisher/TriggeredPublisher.hh @@ -153,8 +153,9 @@ namespace systems /// The current implementation of this system does not support specifying a /// subfield of a repeated field in the "field" attribute. i.e, if /// `field="f1.f2"`, `f1` cannot be a repeated field. - class TriggeredPublisher : public System, - public ISystemConfigure + class TriggeredPublisher : + public System, + public ISystemConfigure { /// \brief Constructor public: TriggeredPublisher() = default; diff --git a/src/systems/user_commands/UserCommands.hh b/src/systems/user_commands/UserCommands.hh index 6bbeb67afa..3db285aad6 100644 --- a/src/systems/user_commands/UserCommands.hh +++ b/src/systems/user_commands/UserCommands.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace ignition diff --git a/src/systems/velocity_control/VelocityControl.hh b/src/systems/velocity_control/VelocityControl.hh index 7b83c4e16b..0b546525a1 100644 --- a/src/systems/velocity_control/VelocityControl.hh +++ b/src/systems/velocity_control/VelocityControl.hh @@ -18,6 +18,7 @@ #define IGNITION_GAZEBO_SYSTEMS_VELOCITYCONTROL_HH_ #include +#include #include diff --git a/src/systems/wind_effects/WindEffects.hh b/src/systems/wind_effects/WindEffects.hh index f477c7667f..3aac7ab967 100644 --- a/src/systems/wind_effects/WindEffects.hh +++ b/src/systems/wind_effects/WindEffects.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace ignition