Merge branch 'main' into jrivero/fix_hidden_visibility_win

gazebosim · Nov 9, 2023 · 50cfc6b · 50cfc6b
2 parents 93f2da7 + 57b6f81
commit 50cfc6b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/profiler/src/RemoteryProfilerImpl.cc b/profiler/src/RemoteryProfilerImpl.cc
@@ -16,7 +16,6 @@
  */
 
 #include "gz/common/config.hh"
-#include <gz/common/profiler/Export.hh>
 
 #include "RemoteryProfilerImpl.hh"
 #include "gz/common/Console.hh"
@@ -25,7 +24,6 @@
 using namespace gz;
 using namespace common;
 
-GZ_COMMON_PROFILER_VISIBLE
 std::string rmtErrorToString(rmtError error) {
   switch (error) {
     case RMT_ERROR_NONE:

diff --git a/src/SignalHandler.cc b/src/SignalHandler.cc
@@ -31,7 +31,7 @@ using namespace gz;
 using namespace common;
 
 // A wrapper for the sigaction sa_handler.
-GZ_COMMON_VISIBLE std::map<int, std::function<void(int)>> gOnSignalWrappers;
+std::map<int, std::function<void(int)>> gOnSignalWrappers;
 std::mutex gWrapperMutex;
 
 /////////////////////////////////////////////////

diff --git a/testing/include/gz/common/testing/CMakeTestPaths.hh b/testing/include/gz/common/testing/CMakeTestPaths.hh
@@ -28,7 +28,7 @@ namespace gz::common::testing
 ///
 /// It is not intended that users will directly construct this, but rather
 /// utilize the TestPathFactory.
-class GZ_COMMON_TESTING_VISIBLE CMakeTestPaths: public TestPaths
+class CMakeTestPaths: public TestPaths
 {
   /// \brief Constructor
   /// \param[in] _projectSourcePath Path to the root of the project source