From 565ec279146e9d576ca34e2b4323b7110ca18ee2 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 15 Jan 2021 17:51:41 +0100 Subject: [PATCH] Add missing IGNITION_GAZEBO_VISIBLE macros Signed-off-by: Jose Luis Rivero --- include/ignition/gazebo/Conversions.hh | 9 ++++-- include/ignition/gazebo/ServerConfig.hh | 2 +- .../gazebo/rendering/MarkerManager.hh | 2 ++ src/Conversions.cc | 31 +++++++++++++++++++ src/LevelManager.hh | 2 +- src/SdfGenerator.hh | 4 +++ 6 files changed, 45 insertions(+), 5 deletions(-) diff --git a/include/ignition/gazebo/Conversions.hh b/include/ignition/gazebo/Conversions.hh index f02c9b4fff..d0def84f21 100644 --- a/include/ignition/gazebo/Conversions.hh +++ b/include/ignition/gazebo/Conversions.hh @@ -63,20 +63,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 50b5d25270..8c0d028562 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/include/ignition/gazebo/rendering/MarkerManager.hh b/include/ignition/gazebo/rendering/MarkerManager.hh index ff9d3d43e4..553ed3d68c 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 diff --git a/src/Conversions.cc b/src/Conversions.cc index 702658db3d..fcf04a4cdc 100644 --- a/src/Conversions.cc +++ b/src/Conversions.cc @@ -61,12 +61,14 @@ #include #include "ignition/gazebo/Conversions.hh" +#include "ignition/gazebo/Export.hh" #include "ignition/gazebo/Util.hh" using namespace ignition; ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Entity_Type ignition::gazebo::convert(const std::string &_in) { msgs::Entity_Type out = msgs::Entity_Type_NONE; @@ -104,6 +106,7 @@ msgs::Entity_Type ignition::gazebo::convert(const std::string &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE math::Pose3d ignition::gazebo::convert(const msgs::Pose &_in) { math::Pose3d out(_in.position().x(), @@ -120,6 +123,7 @@ math::Pose3d ignition::gazebo::convert(const msgs::Pose &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Collision ignition::gazebo::convert(const sdf::Collision &_in) { msgs::Collision out; @@ -132,6 +136,7 @@ msgs::Collision ignition::gazebo::convert(const sdf::Collision &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE sdf::Collision ignition::gazebo::convert(const msgs::Collision &_in) { sdf::Collision out; @@ -143,6 +148,7 @@ sdf::Collision ignition::gazebo::convert(const msgs::Collision &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Geometry ignition::gazebo::convert(const sdf::Geometry &_in) { msgs::Geometry out; @@ -192,6 +198,7 @@ msgs::Geometry ignition::gazebo::convert(const sdf::Geometry &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE sdf::Geometry ignition::gazebo::convert(const msgs::Geometry &_in) { sdf::Geometry out; @@ -255,6 +262,7 @@ sdf::Geometry ignition::gazebo::convert(const msgs::Geometry &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Material ignition::gazebo::convert(const sdf::Material &_in) { msgs::Material out; @@ -314,6 +322,7 @@ msgs::Material ignition::gazebo::convert(const sdf::Material &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE sdf::Material ignition::gazebo::convert(const msgs::Material &_in) { sdf::Material out; @@ -360,6 +369,7 @@ sdf::Material ignition::gazebo::convert(const msgs::Material &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Actor ignition::gazebo::convert(const sdf::Actor &_in) { msgs::Actor out; @@ -399,6 +409,7 @@ msgs::Actor ignition::gazebo::convert(const sdf::Actor &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE sdf::Actor ignition::gazebo::convert(const msgs::Actor &_in) { sdf::Actor out; @@ -441,6 +452,7 @@ sdf::Actor ignition::gazebo::convert(const msgs::Actor &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Light ignition::gazebo::convert(const sdf::Light &_in) { msgs::Light out; @@ -468,6 +480,7 @@ msgs::Light ignition::gazebo::convert(const sdf::Light &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE sdf::Light ignition::gazebo::convert(const msgs::Light &_in) { sdf::Light out; @@ -495,6 +508,7 @@ sdf::Light ignition::gazebo::convert(const msgs::Light &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::GUI ignition::gazebo::convert(const sdf::Gui &_in) { msgs::GUI out; @@ -533,6 +547,7 @@ msgs::GUI ignition::gazebo::convert(const sdf::Gui &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Time ignition::gazebo::convert( const std::chrono::steady_clock::duration &_in) { @@ -548,6 +563,7 @@ msgs::Time ignition::gazebo::convert( ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE std::chrono::steady_clock::duration ignition::gazebo::convert( const msgs::Time &_in) { @@ -556,6 +572,7 @@ std::chrono::steady_clock::duration ignition::gazebo::convert( ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Inertial ignition::gazebo::convert(const math::Inertiald &_in) { msgs::Inertial out; @@ -572,6 +589,7 @@ msgs::Inertial ignition::gazebo::convert(const math::Inertiald &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE math::Inertiald ignition::gazebo::convert(const msgs::Inertial &_in) { math::MassMatrix3d massMatrix; @@ -591,6 +609,7 @@ math::Inertiald ignition::gazebo::convert(const msgs::Inertial &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Axis ignition::gazebo::convert(const sdf::JointAxis &_in) { msgs::Axis out; @@ -620,6 +639,7 @@ msgs::Axis ignition::gazebo::convert(const sdf::JointAxis &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE sdf::JointAxis ignition::gazebo::convert(const msgs::Axis &_in) { sdf::JointAxis out; @@ -639,6 +659,7 @@ sdf::JointAxis ignition::gazebo::convert(const msgs::Axis &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Scene ignition::gazebo::convert(const sdf::Scene &_in) { msgs::Scene out; @@ -669,6 +690,7 @@ msgs::Scene ignition::gazebo::convert(const sdf::Scene &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE sdf::Scene ignition::gazebo::convert(const msgs::Scene &_in) { sdf::Scene out; @@ -698,6 +720,7 @@ sdf::Scene ignition::gazebo::convert(const msgs::Scene &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Atmosphere ignition::gazebo::convert(const sdf::Atmosphere &_in) { msgs::Atmosphere out; @@ -715,6 +738,7 @@ msgs::Atmosphere ignition::gazebo::convert(const sdf::Atmosphere &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE sdf::Atmosphere ignition::gazebo::convert(const msgs::Atmosphere &_in) { sdf::Atmosphere out; @@ -779,6 +803,7 @@ void ignition::gazebo::set(msgs::SensorNoise *_msg, const sdf::Noise &_sdf) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE sdf::Noise ignition::gazebo::convert(const msgs::SensorNoise &_in) { sdf::Noise out; @@ -811,6 +836,7 @@ sdf::Noise ignition::gazebo::convert(const msgs::SensorNoise &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::Sensor ignition::gazebo::convert(const sdf::Sensor &_in) { msgs::Sensor out; @@ -1027,6 +1053,7 @@ msgs::Sensor ignition::gazebo::convert(const sdf::Sensor &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE sdf::Sensor ignition::gazebo::convert(const msgs::Sensor &_in) { sdf::Sensor out; @@ -1266,6 +1293,7 @@ sdf::Sensor ignition::gazebo::convert(const msgs::Sensor &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::WorldStatistics ignition::gazebo::convert(const gazebo::UpdateInfo &_in) { msgs::WorldStatistics out; @@ -1275,6 +1303,7 @@ msgs::WorldStatistics ignition::gazebo::convert(const gazebo::UpdateInfo &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE gazebo::UpdateInfo ignition::gazebo::convert(const msgs::WorldStatistics &_in) { gazebo::UpdateInfo out; @@ -1288,6 +1317,7 @@ gazebo::UpdateInfo ignition::gazebo::convert(const msgs::WorldStatistics &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE msgs::AxisAlignedBox ignition::gazebo::convert(const math::AxisAlignedBox &_in) { msgs::AxisAlignedBox out; @@ -1298,6 +1328,7 @@ msgs::AxisAlignedBox ignition::gazebo::convert(const math::AxisAlignedBox &_in) ////////////////////////////////////////////////// template<> +IGNITION_GAZEBO_VISIBLE math::AxisAlignedBox ignition::gazebo::convert(const msgs::AxisAlignedBox &_in) { math::AxisAlignedBox out; diff --git a/src/LevelManager.hh b/src/LevelManager.hh index 5e51833ae8..556ad87d29 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 cc278c59e0..5e267e9d9b 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);