From a7651460037f40c506d08462ae4744853f5c31b6 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 20 Jan 2021 05:20:46 +0100 Subject: [PATCH] Add missing IGNITION_GAZEBO_VISIBLE macros (#563) Signed-off-by: Jose Luis Rivero --- include/ignition/gazebo/Conversions.hh | 9 ++++++--- include/ignition/gazebo/ServerConfig.hh | 2 +- src/Conversions.cc | 1 + src/LevelManager.hh | 2 +- src/SdfGenerator.hh | 4 ++++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/ignition/gazebo/Conversions.hh b/include/ignition/gazebo/Conversions.hh index a8740a291e7..27dda6b76de 100644 --- a/include/ignition/gazebo/Conversions.hh +++ b/include/ignition/gazebo/Conversions.hh @@ -65,20 +65,23 @@ namespace ignition /// to the values contained in a sdf::Noise object. /// \param[out] _msg SensorNoise message to set. /// \param[in] _sdf SDF Noise object. - void set(msgs::SensorNoise *_msg, const sdf::Noise &_sdf); + void IGNITION_GAZEBO_VISIBLE + set(msgs::SensorNoise *_msg, const sdf::Noise &_sdf); /// \brief Helper function that sets a mutable msgs::WorldStatistics object /// to the values contained in a gazebo::UpdateInfo object. /// \param[out] _msg WorldStatistics message to set. /// \param[in] _in UpdateInfo object. - void set(msgs::WorldStatistics *_msg, const UpdateInfo &_in); + void IGNITION_GAZEBO_VISIBLE + set(msgs::WorldStatistics *_msg, const UpdateInfo &_in); /// \brief Helper function that sets a mutable msgs::Time object /// to the values contained in a std::chrono::steady_clock::duration /// object. /// \param[out] _msg Time message to set. /// \param[in] _in Chrono duration object. - void set(msgs::Time *_msg, const std::chrono::steady_clock::duration &_in); + void IGNITION_GAZEBO_VISIBLE + set(msgs::Time *_msg, const std::chrono::steady_clock::duration &_in); /// \brief Generic conversion from an SDF geometry to another type. /// \param[in] _in SDF geometry. diff --git a/include/ignition/gazebo/ServerConfig.hh b/include/ignition/gazebo/ServerConfig.hh index abb0283cdef..dc0265d19cf 100644 --- a/include/ignition/gazebo/ServerConfig.hh +++ b/include/ignition/gazebo/ServerConfig.hh @@ -49,7 +49,7 @@ namespace ignition /// type and name, but it can't tell apart multiple entities with the same /// name in different parts of the entity tree. /// \sa const std::list &Plugins() const - public: class PluginInfo + public: class IGNITION_GAZEBO_VISIBLE PluginInfo { /// \brief Default constructor. public: PluginInfo(); diff --git a/src/Conversions.cc b/src/Conversions.cc index c582d230b37..88b5b2817f5 100644 --- a/src/Conversions.cc +++ b/src/Conversions.cc @@ -61,6 +61,7 @@ #include #include "ignition/gazebo/Conversions.hh" +#include "ignition/gazebo/Export.hh" #include "ignition/gazebo/Util.hh" using namespace ignition; diff --git a/src/LevelManager.hh b/src/LevelManager.hh index 5e51833ae8c..556ad87d29e 100644 --- a/src/LevelManager.hh +++ b/src/LevelManager.hh @@ -74,7 +74,7 @@ namespace ignition /// when the level is reloaded. Likewise, they should not be deleted. /// * Entities spawned during simulation are part of the default level. /// - class LevelManager + class IGNITION_GAZEBO_VISIBLE LevelManager { /// \brief Constructor /// \param[in] _runner A pointer to the simulationrunner that owns this diff --git a/src/SdfGenerator.hh b/src/SdfGenerator.hh index cc278c59e0b..5e267e9d9b5 100644 --- a/src/SdfGenerator.hh +++ b/src/SdfGenerator.hh @@ -44,6 +44,7 @@ namespace sdf_generator /// \input[in] _config Configuration for the world generator /// \returns Generated world string if generation succeeded. /// Otherwise, nullopt + IGNITION_GAZEBO_VISIBLE std::optional generateWorld( const EntityComponentManager &_ecm, const Entity &_entity, const IncludeUriMap &_includeUriMap = IncludeUriMap(), @@ -56,6 +57,7 @@ namespace sdf_generator /// \input[in] _includeUriMap Map from file paths to URIs used to preserve /// included Fuel models /// \input[in] _config Configuration for the world generator + IGNITION_GAZEBO_VISIBLE bool updateWorldElement( sdf::ElementPtr _elem, const EntityComponentManager &_ecm, const Entity &_entity, @@ -68,6 +70,7 @@ namespace sdf_generator /// \input[in] _ecm Immutable reference to the Entity Component Manager /// \input[in] _entity Model entity /// \returns true if update succeeded. + IGNITION_GAZEBO_VISIBLE bool updateModelElement(const sdf::ElementPtr &_elem, const EntityComponentManager &_ecm, const Entity &_entity); @@ -79,6 +82,7 @@ namespace sdf_generator /// \input[in] _entity Entity of included resource /// \input[in] _uri Uri of the resource /// \returns true if update succeeded. + IGNITION_GAZEBO_VISIBLE bool updateIncludeElement(const sdf::ElementPtr &_elem, const EntityComponentManager &_ecm, const Entity &_entity, const std::string &_uri);