Skip to content

Commit 7911803

Browse files
j-riverochapulina
j-rivero
authored and
chapulina
committed
Fix visibility macro names when used by a different component (Windows) (#564)
Signed-off-by: Jose Luis Rivero <[email protected]>
1 parent a3738d5 commit 7911803

File tree

27 files changed

+25
-29
lines changed

27 files changed

+25
-29
lines changed

‎include/ignition/gazebo/gui/Gui.hh

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <ignition/gui/Application.hh>
2323

2424
#include "ignition/gazebo/config.hh"
25-
#include "ignition/gazebo/Export.hh"
25+
#include "ignition/gazebo/gui/Export.hh"
2626

2727
namespace ignition
2828
{
@@ -41,7 +41,7 @@ namespace gui
4141
/// ign-tools. Set to the name of the application if using ign-tools)
4242
/// \param[in] _guiConfig The GUI configuration file. If nullptr, the default
4343
/// configuration from IGN_HOMEDIR/.ignition/gazebo/gui.config will be used.
44-
IGNITION_GAZEBO_VISIBLE int runGui(int &_argc, char **_argv,
44+
IGNITION_GAZEBO_GUI_VISIBLE int runGui(int &_argc, char **_argv,
4545
const char *_guiConfig);
4646

4747
/// \brief Create a Gazebo GUI application
@@ -60,7 +60,8 @@ namespace gui
6060
/// IGN_HOMEDIR/.ignition/gazebo/gui.config will be used.
6161
/// \param[in] _loadPluginsFromSdf If true, plugins specified in the world
6262
/// SDFormat file will get loaded.
63-
IGNITION_GAZEBO_VISIBLE std::unique_ptr<ignition::gui::Application> createGui(
63+
IGNITION_GAZEBO_GUI_VISIBLE
64+
std::unique_ptr<ignition::gui::Application> createGui(
6465
int &_argc, char **_argv, const char *_guiConfig,
6566
const char *_defaultGuiConfig = nullptr, bool _loadPluginsFromSdf = true);
6667

‎include/ignition/gazebo/gui/GuiRunner.hh

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <ignition/transport/Node.hh>
2828

2929
#include "ignition/gazebo/EntityComponentManager.hh"
30-
#include "ignition/gazebo/Export.hh"
30+
#include "ignition/gazebo/gui/Export.hh"
3131

3232
namespace ignition
3333
{
@@ -37,7 +37,7 @@ namespace gazebo
3737
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
3838
/// \brief Responsible for running GUI systems as new states are received from
3939
/// the backend.
40-
class IGNITION_GAZEBO_VISIBLE GuiRunner : public QObject
40+
class IGNITION_GAZEBO_GUI_VISIBLE GuiRunner : public QObject
4141
{
4242
Q_OBJECT
4343

‎include/ignition/gazebo/rendering/MarkerManager.hh

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
#include <memory>
2121
#include <string>
2222

23+
#include <ignition/gazebo/rendering/Export.hh>
24+
2325
#include "ignition/rendering/RenderTypes.hh"
2426

2527
namespace ignition
@@ -32,7 +34,7 @@ class MarkerManagerPrivate;
3234

3335
/// \brief Creates, deletes, and maintains marker visuals. Only the
3436
/// Scene class should instantiate and use this class.
35-
class IGNITION_GAZEBO_VISIBLE MarkerManager
37+
class IGNITION_GAZEBO_RENDERING_VISIBLE MarkerManager
3638
{
3739
/// \brief Constructor
3840
public: MarkerManager();

‎include/ignition/gazebo/rendering/RenderUtil.hh

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <sdf/Sensor.hh>
2525

2626
#include <ignition/gazebo/config.hh>
27-
#include <ignition/gazebo/Export.hh>
27+
#include <ignition/gazebo/rendering/Export.hh>
2828
#include <ignition/gazebo/System.hh>
2929

3030
#include "ignition/gazebo/rendering/SceneManager.hh"
@@ -41,7 +41,7 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
4141
class RenderUtilPrivate;
4242

4343
/// \class RenderUtil RenderUtil.hh ignition/gazebo/gui/plugins/RenderUtil.hh
44-
class IGNITION_GAZEBO_VISIBLE RenderUtil
44+
class IGNITION_GAZEBO_RENDERING_VISIBLE RenderUtil
4545
{
4646
/// \brief Constructor
4747
public: explicit RenderUtil();

‎include/ignition/gazebo/rendering/SceneManager.hh

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include <ignition/gazebo/config.hh>
3838
#include <ignition/gazebo/Entity.hh>
39-
#include <ignition/gazebo/Export.hh>
39+
#include <ignition/gazebo/rendering/Export.hh>
4040

4141
namespace ignition
4242
{
@@ -48,7 +48,7 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
4848
class SceneManagerPrivate;
4949

5050
/// \brief Scene manager class for loading and managing objects in the scene
51-
class IGNITION_GAZEBO_VISIBLE SceneManager
51+
class IGNITION_GAZEBO_RENDERING_VISIBLE SceneManager
5252
{
5353
/// \brief Constructor
5454
public: SceneManager();

‎src/systems/air_pressure/AirPressure.hh

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <memory>
2121
#include <ignition/gazebo/config.hh>
22-
#include <ignition/gazebo/Export.hh>
2322
#include <ignition/gazebo/System.hh>
2423

2524
namespace ignition

‎src/systems/altimeter/Altimeter.hh

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <memory>
2121
#include <ignition/gazebo/config.hh>
22-
#include <ignition/gazebo/Export.hh>
2322
#include <ignition/gazebo/System.hh>
2423

2524
namespace ignition

‎src/systems/breadcrumbs/Breadcrumbs.hh

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define IGNITION_GAZEBO_SYSTEMS_BREADCRUMBS_HH_
1919

2020
#include <memory>
21+
#include <optional>
2122
#include <set>
2223
#include <unordered_map>
2324
#include <vector>

‎src/systems/camera_video_recorder/CameraVideoRecorder.hh

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <memory>
2121
#include <ignition/gazebo/config.hh>
22-
#include <ignition/gazebo/Export.hh>
2322
#include <ignition/gazebo/System.hh>
2423

2524
namespace ignition

‎src/systems/contact/Contact.hh

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#define IGNITION_GAZEBO_SYSTEMS_CONTACT_HH_
1919

2020
#include <memory>
21-
#include <ignition/gazebo/Export.hh>
2221
#include <ignition/gazebo/System.hh>
2322

2423
namespace ignition

‎src/systems/imu/Imu.hh

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <memory>
2121
#include <ignition/gazebo/config.hh>
22-
#include <ignition/gazebo/Export.hh>
2322
#include <ignition/gazebo/System.hh>
2423

2524
namespace ignition

‎src/systems/log/LogPlayback.hh

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <memory>
2121

2222
#include <ignition/gazebo/config.hh>
23-
#include <ignition/gazebo/Export.hh>
2423
#include <ignition/gazebo/System.hh>
2524

2625
namespace ignition

‎src/systems/log/LogRecord.hh

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <memory>
2121

2222
#include <ignition/gazebo/config.hh>
23-
#include <ignition/gazebo/Export.hh>
2423
#include <ignition/gazebo/System.hh>
2524

2625
namespace ignition

‎src/systems/log_video_recorder/LogVideoRecorder.hh

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <memory>
2121
#include <vector>
2222
#include <ignition/gazebo/config.hh>
23-
#include <ignition/gazebo/Export.hh>
2423
#include <ignition/gazebo/System.hh>
2524

2625
namespace ignition

‎src/systems/logical_camera/LogicalCamera.hh

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <memory>
2121
#include <ignition/gazebo/config.hh>
22-
#include <ignition/gazebo/Export.hh>
2322
#include <ignition/gazebo/System.hh>
2423

2524
namespace ignition

‎src/systems/magnetometer/Magnetometer.hh

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <memory>
2121
#include <ignition/gazebo/config.hh>
22-
#include <ignition/gazebo/Export.hh>
2322
#include <ignition/gazebo/System.hh>
2423

2524
namespace ignition

‎src/systems/multicopter_control/Common.hh

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#define IGNITION_GAZEBO_SYSTEMS_MULTICOPTERVELOCITYCONTROL_COMMON_HH_
2020

2121
#include <Eigen/Geometry>
22+
#include <optional>
2223
#include <vector>
2324

2425
#include <sdf/sdf.hh>

‎src/systems/physics/Physics.hh

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
#include <ignition/physics/sdf/ConstructWorld.hh>
4747

4848
#include <ignition/gazebo/config.hh>
49-
#include <ignition/gazebo/Export.hh>
5049
#include <ignition/gazebo/System.hh>
5150

5251
namespace ignition

‎src/systems/pose_publisher/PosePublisher.hh

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <memory>
2121
#include <ignition/gazebo/config.hh>
22-
#include <ignition/gazebo/Export.hh>
2322
#include <ignition/gazebo/System.hh>
2423

2524
namespace ignition

‎src/systems/scene_broadcaster/SceneBroadcaster.hh

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <memory>
2121
#include <vector>
2222
#include <ignition/gazebo/config.hh>
23-
#include <ignition/gazebo/Export.hh>
2423
#include <ignition/gazebo/System.hh>
2524

2625
namespace ignition

‎src/systems/sensors/Sensors.hh

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <string>
2222

2323
#include <ignition/gazebo/config.hh>
24-
#include <ignition/gazebo/Export.hh>
2524
#include <ignition/gazebo/System.hh>
2625
#include <sdf/Sensor.hh>
2726

‎src/systems/thermal/Thermal.hh

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <memory>
2121
#include <ignition/gazebo/config.hh>
22-
#include <ignition/gazebo/Export.hh>
2322
#include <ignition/gazebo/System.hh>
2423

2524
namespace ignition

‎src/systems/triggered_publisher/TriggeredPublisher.cc

+6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "TriggeredPublisher.hh"
1919

20+
#include <google/protobuf/message.h>
2021
#include <google/protobuf/text_format.h>
2122
#include <google/protobuf/util/message_differencer.h>
2223

@@ -27,6 +28,11 @@
2728
#include <ignition/common/Util.hh>
2829
#include <ignition/plugin/Register.hh>
2930

31+
// bug https://github.com/protocolbuffers/protobuf/issues/5051
32+
#ifdef _WIN32
33+
#undef GetMessage
34+
#endif
35+
3036
using namespace ignition;
3137
using namespace gazebo;
3238
using namespace systems;

‎src/systems/triggered_publisher/TriggeredPublisher.hh

+3-2
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,9 @@ namespace systems
153153
/// The current implementation of this system does not support specifying a
154154
/// subfield of a repeated field in the "field" attribute. i.e, if
155155
/// `field="f1.f2"`, `f1` cannot be a repeated field.
156-
class TriggeredPublisher : public System,
157-
public ISystemConfigure
156+
class TriggeredPublisher :
157+
public System,
158+
public ISystemConfigure
158159
{
159160
/// \brief Constructor
160161
public: TriggeredPublisher() = default;

‎src/systems/user_commands/UserCommands.hh

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <memory>
2121
#include <ignition/gazebo/config.hh>
22-
#include <ignition/gazebo/Export.hh>
2322
#include <ignition/gazebo/System.hh>
2423

2524
namespace ignition

‎src/systems/velocity_control/VelocityControl.hh

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define IGNITION_GAZEBO_SYSTEMS_VELOCITYCONTROL_HH_
1919

2020
#include <memory>
21+
#include <optional>
2122

2223
#include <ignition/gazebo/System.hh>
2324

‎src/systems/wind_effects/WindEffects.hh

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <memory>
2121
#include <ignition/gazebo/config.hh>
22-
#include <ignition/gazebo/Export.hh>
2322
#include <ignition/gazebo/System.hh>
2423

2524
namespace ignition

0 commit comments

Comments
 (0)