Remove invalid visibility macros to fix Windows compilation

include/ignition/gazebo/System.hh

@@ -70,13 +70,13 @@ namespace ignition
  /// explains why UpdateInfo::simTime is initially 0 if simulation is started
  /// paused, while UpdateInfo::simTime is initially UpdateInfo::dt if
  /// simulation is started un-paused.
- class IGNITION_GAZEBO_VISIBLE System
+ class System
  {
  /// \brief Constructor
- public: System();
+ public: System() = default;
 
  /// \brief Destructor
- public: virtual ~System();
+ public: virtual ~System() = default;
  };
 
  /// \class ISystemConfigure ISystem.hh ignition/gazebo/System.hh
@@ -85,7 +85,7 @@ namespace ignition
  /// Configure is called after the system is instatiated and all entities
  /// and components are loaded from the corresponding SDF world, and before
  /// simulation begins exectution.
- class IGNITION_GAZEBO_VISIBLE ISystemConfigure {
+ class ISystemConfigure {
  /// \brief Configure the system
  /// \param[in] _entity The entity this plugin is attached to.
  /// \param[in] _sdf The SDF Element associated with this system plugin.
@@ -102,21 +102,21 @@ namespace ignition
 
  /// \class ISystemPreUpdate ISystem.hh ignition/gazebo/System.hh
  /// \brief Interface for a system that uses the PreUpdate phase
- class IGNITION_GAZEBO_VISIBLE ISystemPreUpdate {
+ class ISystemPreUpdate {
  public: virtual void PreUpdate(const UpdateInfo &_info,
  EntityComponentManager &_ecm) = 0;
  };
 
  /// \class ISystemUpdate ISystem.hh ignition/gazebo/System.hh
  /// \brief Interface for a system that uses the Update phase
- class IGNITION_GAZEBO_VISIBLE ISystemUpdate {
+ class ISystemUpdate {
  public: virtual void Update(const UpdateInfo &_info,
  EntityComponentManager &_ecm) = 0;
  };
 
  /// \class ISystemPostUpdate ISystem.hh ignition/gazebo/System.hh
  /// \brief Interface for a system that uses the PostUpdate phase
- class IGNITION_GAZEBO_VISIBLE ISystemPostUpdate{
+ class ISystemPostUpdate{
  public: virtual void PostUpdate(const UpdateInfo &_info,
  const EntityComponentManager &_ecm) = 0;
  };

include/ignition/gazebo/components/Factory.hh

@@ -41,7 +41,7 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace components
 {
  /// \brief A base class for an object responsible for creating components.
- class IGNITION_GAZEBO_VISIBLE ComponentDescriptorBase
+ class ComponentDescriptorBase
  {
  /// \brief Destructor
  public: virtual ~ComponentDescriptorBase() = default;
@@ -54,7 +54,7 @@ namespace components
  /// \brief A class for an object responsible for creating components.
  /// \tparam ComponentTypeT type of component to describe.
  template <typename ComponentTypeT>
- class IGNITION_GAZEBO_VISIBLE ComponentDescriptor
+ class ComponentDescriptor
  : public ComponentDescriptorBase
  {
  /// \brief Create an instance of a ComponentTypeT Component.
@@ -66,7 +66,7 @@ namespace components
  };
 
  /// \brief A base class for an object responsible for creating storages.
- class IGNITION_GAZEBO_VISIBLE StorageDescriptorBase
+ class StorageDescriptorBase
  {
  /// \brief Destructor
  public: virtual ~StorageDescriptorBase() = default;
@@ -79,7 +79,7 @@ namespace components
  /// \brief A class for an object responsible for creating storages.
  /// \tparam ComponentTypeT type of component that the storage will hold.
  template <typename ComponentTypeT>
- class IGNITION_GAZEBO_VISIBLE StorageDescriptor
+ class StorageDescriptor
  : public StorageDescriptorBase
  {
  /// \brief Create an instance of a storage that holds ComponentTypeT
@@ -92,7 +92,7 @@ namespace components
  };
 
  /// \brief A factory that generates a component based on a string type.
- class IGNITION_GAZEBO_VISIBLE Factory
+ class Factory
  : public ignition::common::SingletonT<Factory>
  {
  /// \brief Register a component so that the factory can create instances
@@ -329,7 +329,7 @@ namespace components
  /// \param[in] _compType Component type name.
  /// \param[in] _classname Class name for component.
  #define IGN_GAZEBO_REGISTER_COMPONENT(_compType, _classname) \
- class IGNITION_GAZEBO_VISIBLE IgnGazeboComponents##_classname \
+ class IgnGazeboComponents##_classname \
  { \
  public: IgnGazeboComponents##_classname() \
  { \

src/CMakeLists.txt

@@ -51,7 +51,6 @@ set (sources
  ServerConfig.cc
  ServerPrivate.cc
  SimulationRunner.cc
- System.cc
  SystemLoader.cc
  Util.cc
  View.cc

src/cmd/ign.cc

@@ -32,32 +32,32 @@
 #include "ign.hh"
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE char *ignitionGazeboVersion()
+extern "C" char *ignitionGazeboVersion()
 {
  return strdup(IGNITION_GAZEBO_VERSION_FULL);
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE char *gazeboVersionHeader()
+extern "C" char *gazeboVersionHeader()
 {
  return strdup(IGNITION_GAZEBO_VERSION_HEADER);
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE void cmdVerbosity(
+extern "C" void cmdVerbosity(
  const char *_verbosity)
 {
  ignition::common::Console::SetVerbosity(std::atoi(_verbosity));
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE const char *worldInstallDir()
+extern "C" const char *worldInstallDir()
 {
  return IGN_GAZEBO_WORLD_INSTALL_DIR;
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE int runServer(const char *_sdfString,
+extern "C" int runServer(const char *_sdfString,
  int _iterations, int _run, float _hz, int _levels, const char *_networkRole,
  int _networkSecondaries, int _record, const char *_recordPath,
  int _logOverwrite, const char *_playback, const char *_file)
@@ -206,7 +206,7 @@ extern "C" IGNITION_GAZEBO_VISIBLE int runServer(const char *_sdfString,
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE int runGui(const char *_guiConfig)
+extern "C" int runGui(const char *_guiConfig)
 {
  ignition::common::SignalHandler sigHandler;
  bool sigKilled = false;

src/ign.cc

@@ -35,32 +35,32 @@
 #include "ignition/gazebo/gui/Gui.hh"
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE char *ignitionGazeboVersion()
+extern "C" char *ignitionGazeboVersion()
 {
  return strdup(IGNITION_GAZEBO_VERSION_FULL);
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE char *gazeboVersionHeader()
+extern "C" char *gazeboVersionHeader()
 {
  return strdup(IGNITION_GAZEBO_VERSION_HEADER);
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE void cmdVerbosity(
+extern "C" void cmdVerbosity(
  const char *_verbosity)
 {
  ignition::common::Console::SetVerbosity(std::atoi(_verbosity));
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE const char *worldInstallDir()
+extern "C" const char *worldInstallDir()
 {
  return IGN_GAZEBO_WORLD_INSTALL_DIR;
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE const char *findFuelResource(
+extern "C" const char *findFuelResource(
  char *_pathToResource)
 {
  std::string path;
@@ -115,7 +115,7 @@ extern "C" IGNITION_GAZEBO_VISIBLE const char *findFuelResource(
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE int runServer(const char *_sdfString,
+extern "C" int runServer(const char *_sdfString,
  int _iterations, int _run, float _hz, int _levels, const char *_networkRole,
  int _networkSecondaries, int _record, const char *_recordPath,
  int _recordResources, int _logOverwrite, int _logCompress,
@@ -355,7 +355,7 @@ extern "C" IGNITION_GAZEBO_VISIBLE int runServer(const char *_sdfString,
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE int runGui(const char *_guiConfig)
+extern "C" int runGui(const char *_guiConfig)
 {
  // argc and argv are going to be passed to a QApplication. The Qt
  // documentation has a warning about these:

src/ign.hh

@@ -21,18 +21,18 @@
 
 /// \brief External hook to read the library version.
 /// \return C-string representing the version. Ex.: 0.1.2
-extern "C" IGNITION_GAZEBO_VISIBLE char *ignitionGazeboVersion();
+extern "C" char *ignitionGazeboVersion();
 
 /// \brief Get the Gazebo version header.
 /// \return C-string containing the Gazebo version information.
-extern "C" IGNITION_GAZEBO_VISIBLE char *gazeboVersionHeader();
+extern "C" char *gazeboVersionHeader();
 
 /// \brief Set verbosity level
 /// \param[in] _verbosity 0 to 4
-extern "C" IGNITION_GAZEBO_VISIBLE void cmdVerbosity(
+extern "C" void cmdVerbosity(
  const char *_verbosity);
 
-extern "C" IGNITION_GAZEBO_VISIBLE const char *worldInstallDir();
+extern "C" const char *worldInstallDir();
 
 /// \brief External hook to run simulation server.
 /// \param[in] _sdfString SDF file to run, as a string.
@@ -55,7 +55,7 @@ extern "C" IGNITION_GAZEBO_VISIBLE const char *worldInstallDir();
 /// \param[in] _recordTopics Colon separated list of topics to record. Leave
 /// null to record the default topics.
 /// \return 0 if successful, 1 if not.
-extern "C" IGNITION_GAZEBO_VISIBLE int runServer(const char *_sdfString,
+extern "C" int runServer(const char *_sdfString,
  int _iterations, int _run, float _hz, int _levels,
  const char *_networkRole, int _networkSecondaries, int _record,
  const char *_recordPath, int _recordResources, int _logOverwrite,
@@ -67,13 +67,13 @@ extern "C" IGNITION_GAZEBO_VISIBLE int runServer(const char *_sdfString,
 /// \brief External hook to run simulation GUI.
 /// \param[in] _guiConfig Path to Ignition GUI configuration file.
 /// \return 0 if successful, 1 if not.
-extern "C" IGNITION_GAZEBO_VISIBLE int runGui(const char *_guiConfig);
+extern "C" int runGui(const char *_guiConfig);
 
 /// \brief External hook to find or download a fuel world provided a URL.
 /// \param[in] _pathToResource Path to the fuel world resource, ie,
 /// https://staging-fuel.ignitionrobotics.org/1.0/gmas/worlds/ShapesClone
 /// \return C-string containing the path to the local world sdf file
-extern "C" IGNITION_GAZEBO_VISIBLE const char *findFuelResource(
+extern "C" const char *findFuelResource(
  char *_pathToResource);
 
 #endif

test/plugins/EventTriggerSystem.hh

@@ -25,13 +25,14 @@ namespace ignition
 {
 namespace gazebo
 {
-class IGNITION_GAZEBO_VISIBLE EventTriggerSystem :
+class EventTriggerSystem :
  public gazebo::System,
  public gazebo::ISystemConfigure,
  public gazebo::ISystemUpdate
 {
  // needed for linter
  public: EventTriggerSystem() = default;
+ public: ~EventTriggerSystem() = default;
 
  public: void Configure(const Entity &/*_entity*/,
  const std::shared_ptr<const sdf::Element> &/*_sdf*/,

test/plugins/MockSystem.hh

@@ -23,12 +23,14 @@
 
 namespace ignition {
  namespace gazebo {
- class IGNITION_GAZEBO_VISIBLE MockSystem :
+ class MockSystem :
  public gazebo::System,
  public gazebo::ISystemPreUpdate,
  public gazebo::ISystemUpdate,
  public gazebo::ISystemPostUpdate
  {
+ public: MockSystem() = default;
+ public: ~MockSystem() = default;
  public: size_t preUpdateCallCount {0};
  public: size_t updateCallCount {0};
  public: size_t postUpdateCallCount {0};

test/plugins/Null.hh

@@ -33,7 +33,7 @@ namespace systems
 {
  /// \class Null Null.hh ignition/gazebo/systems/Null.hh
  /// \brief Minimal system implementation
- class IGNITION_GAZEBO_VISIBLE Null:
+ class Null:
  public System,
  public ISystemConfigure,
  public ISystemPreUpdate,