Porting Dome to Edifice: Windows, deprecations (#948)

Signed-off-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Jul 30, 2021 · 09e2ea7 · 09e2ea7
1 parent cc89d55
commit 09e2ea7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/include/ignition/gazebo/Util.hh b/include/ignition/gazebo/Util.hh
@@ -219,7 +219,7 @@ namespace ignition
     /// \return True if a component was created or removed, false if nothing
     /// changed.
     template <class ComponentType>
-    bool IGNITION_GAZEBO_VISIBLE enableComponent(EntityComponentManager &_ecm,
+    bool enableComponent(EntityComponentManager &_ecm,
         Entity _entity, bool _enable = true)
     {
       bool changed{false};

diff --git a/src/cmd/ModelCommandAPI.cc b/src/cmd/ModelCommandAPI.cc
@@ -330,7 +330,7 @@ void printJoints(const uint64_t _modelEntity,
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE void cmdModelList()
+extern "C" void cmdModelList()
 {
   EntityComponentManager ecm{};
   if (!populateECM(ecm))
@@ -364,7 +364,7 @@ extern "C" IGNITION_GAZEBO_VISIBLE void cmdModelList()
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE void cmdModelInfo(
+extern "C" void cmdModelInfo(
     const char *_modelName, int _pose, const char *_linkName,
     const char *_jointName)
 {

diff --git a/src/cmd/ModelCommandAPI.hh b/src/cmd/ModelCommandAPI.hh
@@ -15,17 +15,15 @@
  *
 */
 
-#include "ignition/gazebo/Export.hh"
-
 /// \brief External hook to get a list of available models.
-extern "C" IGNITION_GAZEBO_VISIBLE void cmdModelList();
+extern "C" void cmdModelList();
 
 /// \brief External hook to dump model information.
 /// \param[in] _modelName Model name.
 /// \param[in] _pose --pose option.
 /// \param[in] _link_name Link name.
 /// \param[in] _joint_name Joint name.
-extern "C" IGNITION_GAZEBO_VISIBLE void cmdModelInfo(
+extern "C" void cmdModelInfo(
     const char *_modelName, int _pose, const char *_linkName,
     const char *_jointName);
 
diff --git a/src/gui/plugins/plot_3d/Plot3D_TEST.cc b/src/gui/plugins/plot_3d/Plot3D_TEST.cc
@@ -29,6 +29,7 @@
 #include <ignition/gui/Plugin.hh>
 #include <ignition/transport/Node.hh>
 #include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 #include "ignition/gazebo/components/Joint.hh"
 #include "ignition/gazebo/components/JointAxis.hh"
@@ -73,7 +74,9 @@ TEST_F(Plot3D, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load))
   app->AddPluginPath(std::string(PROJECT_BINARY_PATH) + "/lib");
 
   // Create GUI runner to handle gazebo::gui plugins
+  IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION
   auto runner = new gazebo::GuiRunner("test");
+  IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION
   runner->setParent(gui::App());
 
   // Add plugin