From 1af67032d44a9d5835018be115e0fdaab3b5a870 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 6 Nov 2023 20:02:19 +0100 Subject: [PATCH 01/14] Remove broken visibility attributes. Fix Windows Signed-off-by: Jose Luis Rivero --- testing/include/gz/common/testing/CMakeTestPaths.hh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/testing/include/gz/common/testing/CMakeTestPaths.hh b/testing/include/gz/common/testing/CMakeTestPaths.hh index 6ca7de40..0ce2471a 100644 --- a/testing/include/gz/common/testing/CMakeTestPaths.hh +++ b/testing/include/gz/common/testing/CMakeTestPaths.hh @@ -34,15 +34,13 @@ class GZ_COMMON_TESTING_VISIBLE CMakeTestPaths: public TestPaths public: using TestPaths::TestPaths; /// \brief Destructor - public: GZ_COMMON_TESTING_VISIBLE ~CMakeTestPaths() override; + public: ~CMakeTestPaths() override; /// Documentation inherited - public: bool GZ_COMMON_TESTING_VISIBLE - ProjectSourcePath(std::string &_sourceDir) override; + public: bool ProjectSourcePath(std::string &_sourceDir) override; /// Documentation inherited - public: bool GZ_COMMON_TESTING_VISIBLE - TestTmpPath(std::string &_tmpDir) override; + public: bool TestTmpPath(std::string &_tmpDir) override; }; } // namespace gz::common::testing #endif // GZ_COMMON_TESTING_CMAKETESTPATHS_HH_ From 44f77e40e23c2c9f60ff7c75d06d39cafd3a3960 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 6 Nov 2023 22:26:53 +0100 Subject: [PATCH 02/14] Fix Windows visibility for Testing class Signed-off-by: Jose Luis Rivero --- testing/include/gz/common/testing/TestPaths.hh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/testing/include/gz/common/testing/TestPaths.hh b/testing/include/gz/common/testing/TestPaths.hh index ce887f51..136c907a 100644 --- a/testing/include/gz/common/testing/TestPaths.hh +++ b/testing/include/gz/common/testing/TestPaths.hh @@ -63,27 +63,22 @@ class TestPaths { /// \brief Constructor /// \param[in] _projectSourcePath Path to the root of the project source - public: GZ_COMMON_TESTING_VISIBLE - explicit TestPaths(const std::string &_projectSourcePath = + public: explicit GZ_COMMON_TESTING_VISIBLE TestPaths(const std::string &_projectSourcePath = kTestingProjectSourceDir); /// \brief Destructor - public: GZ_COMMON_TESTING_VISIBLE - virtual ~TestPaths() = 0; + public: virtual ~TestPaths() = 0; /// brief Populate the path to the root project source directory /// \param[out] _sourceDir path to the root project source directory /// \return True if path successfully found and set, false otherwise - public: virtual bool GZ_COMMON_TESTING_VISIBLE - ProjectSourcePath(std::string &_sourceDir) = 0; + public: virtual bool ProjectSourcePath(std::string &_sourceDir) = 0; /// \brief Populate the path to a temporary directory /// \param[out] _tmpDir path to the root temporary directory /// \return True if path successfully found and set, false otherwise - public: virtual bool GZ_COMMON_TESTING_VISIBLE - TestTmpPath(std::string &_tmpDir) = 0; + public: virtual bool TestTmpPath(std::string &_tmpDir) = 0; - /// \brief Path to the root of the project source protected: std::string projectSourcePath; }; From c2cbfbf0366d4099142d926795a7535d026632b5 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 7 Nov 2023 19:10:29 +0100 Subject: [PATCH 03/14] Ignore warning for the current version of MSVC Signed-off-by: Jose Luis Rivero --- testing/include/gz/common/testing/CMakeTestPaths.hh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/testing/include/gz/common/testing/CMakeTestPaths.hh b/testing/include/gz/common/testing/CMakeTestPaths.hh index 0ce2471a..9c8c55c1 100644 --- a/testing/include/gz/common/testing/CMakeTestPaths.hh +++ b/testing/include/gz/common/testing/CMakeTestPaths.hh @@ -28,6 +28,18 @@ namespace gz::common::testing /// /// It is not intended that users will directly construct this, but rather /// utilize the TestPathFactory. + +/// TODO(jrivero) Remove warning disable when bumping MSVC oon CI +/// MSVC v16.11.25 complains about the TestPaths class not having a DLL although +/// relevant members of it have visiblity defined: +/// "non dll-interface class 'gz::common::testing::TestPaths' used as base for +/// dll-interface class 'gz::common::testing::CMakeTestPaths'" +/// +/// Workaround on this problems triggeres new warnings and suffering and +/// more recent versions of MSVC do not trigger that warning anymore. +/// Cnnclusion: disable the warnoing. +# pragma warning( push ) +# pragma warning( disable: 4275 ) class GZ_COMMON_TESTING_VISIBLE CMakeTestPaths: public TestPaths { /// \brief Constructor from TestPaths @@ -43,4 +55,5 @@ class GZ_COMMON_TESTING_VISIBLE CMakeTestPaths: public TestPaths public: bool TestTmpPath(std::string &_tmpDir) override; }; } // namespace gz::common::testing +# pragma warning( popd ) #endif // GZ_COMMON_TESTING_CMAKETESTPATHS_HH_ From f4b52f8f10958bd6bf60c1bd92c7da189dcb5b77 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Wed, 8 Nov 2023 10:20:00 -0600 Subject: [PATCH 04/14] Apply suggestions from code review Co-authored-by: Addisu Z. Taddese Signed-off-by: Michael Carroll --- testing/include/gz/common/testing/CMakeTestPaths.hh | 12 +++++++----- testing/include/gz/common/testing/TestPaths.hh | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/testing/include/gz/common/testing/CMakeTestPaths.hh b/testing/include/gz/common/testing/CMakeTestPaths.hh index 9c8c55c1..b5e5d8c6 100644 --- a/testing/include/gz/common/testing/CMakeTestPaths.hh +++ b/testing/include/gz/common/testing/CMakeTestPaths.hh @@ -29,17 +29,19 @@ namespace gz::common::testing /// It is not intended that users will directly construct this, but rather /// utilize the TestPathFactory. -/// TODO(jrivero) Remove warning disable when bumping MSVC oon CI +/// TODO(jrivero) Remove warning disable when bumping MSVC on CI /// MSVC v16.11.25 complains about the TestPaths class not having a DLL although /// relevant members of it have visiblity defined: /// "non dll-interface class 'gz::common::testing::TestPaths' used as base for /// dll-interface class 'gz::common::testing::CMakeTestPaths'" /// -/// Workaround on this problems triggeres new warnings and suffering and +/// Workaround on this problems triggers new warnings and suffering and /// more recent versions of MSVC do not trigger that warning anymore. -/// Cnnclusion: disable the warnoing. -# pragma warning( push ) -# pragma warning( disable: 4275 ) +/// Conclusion: disable the warning. +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable: 4275) +#endif class GZ_COMMON_TESTING_VISIBLE CMakeTestPaths: public TestPaths { /// \brief Constructor from TestPaths diff --git a/testing/include/gz/common/testing/TestPaths.hh b/testing/include/gz/common/testing/TestPaths.hh index 136c907a..b234a97b 100644 --- a/testing/include/gz/common/testing/TestPaths.hh +++ b/testing/include/gz/common/testing/TestPaths.hh @@ -63,8 +63,8 @@ class TestPaths { /// \brief Constructor /// \param[in] _projectSourcePath Path to the root of the project source - public: explicit GZ_COMMON_TESTING_VISIBLE TestPaths(const std::string &_projectSourcePath = - kTestingProjectSourceDir); + public: explicit GZ_COMMON_TESTING_VISIBLE TestPaths( + const std::string &_projectSourcePath = kTestingProjectSourceDir); /// \brief Destructor public: virtual ~TestPaths() = 0; From b0394a570e9e3758d1154f74e3928b694c24be33 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 8 Nov 2023 09:07:45 -0800 Subject: [PATCH 05/14] fix pragma warning pop Signed-off-by: Steve Peters Signed-off-by: Steve Peters --- testing/include/gz/common/testing/CMakeTestPaths.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/include/gz/common/testing/CMakeTestPaths.hh b/testing/include/gz/common/testing/CMakeTestPaths.hh index b5e5d8c6..998fe939 100644 --- a/testing/include/gz/common/testing/CMakeTestPaths.hh +++ b/testing/include/gz/common/testing/CMakeTestPaths.hh @@ -57,5 +57,5 @@ class GZ_COMMON_TESTING_VISIBLE CMakeTestPaths: public TestPaths public: bool TestTmpPath(std::string &_tmpDir) override; }; } // namespace gz::common::testing -# pragma warning( popd ) +# pragma warning( pop ) #endif // GZ_COMMON_TESTING_CMAKETESTPATHS_HH_ From c60420297a1cb3e0a5a3d91fd64e5b784fff6f80 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 8 Nov 2023 18:32:07 +0100 Subject: [PATCH 06/14] Add MSVC_VER for pragma pop Signed-off-by: Jose Luis Rivero --- testing/include/gz/common/testing/CMakeTestPaths.hh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testing/include/gz/common/testing/CMakeTestPaths.hh b/testing/include/gz/common/testing/CMakeTestPaths.hh index 998fe939..f37b566c 100644 --- a/testing/include/gz/common/testing/CMakeTestPaths.hh +++ b/testing/include/gz/common/testing/CMakeTestPaths.hh @@ -57,5 +57,7 @@ class GZ_COMMON_TESTING_VISIBLE CMakeTestPaths: public TestPaths public: bool TestTmpPath(std::string &_tmpDir) override; }; } // namespace gz::common::testing +#ifdef _MSC_VER # pragma warning( pop ) +#endif #endif // GZ_COMMON_TESTING_CMAKETESTPATHS_HH_ From 34455dab617765bc3e8b88096620fd46582a4964 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 14:56:26 +0100 Subject: [PATCH 07/14] Use TestFactory for CMakeTestPath Signed-off-by: Jose Luis Rivero --- testing/src/CMakeTestPaths_TEST.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/src/CMakeTestPaths_TEST.cc b/testing/src/CMakeTestPaths_TEST.cc index b9730ff4..fb5047a0 100644 --- a/testing/src/CMakeTestPaths_TEST.cc +++ b/testing/src/CMakeTestPaths_TEST.cc @@ -61,10 +61,10 @@ TEST(CMakeTestPaths, TestBuildType) ///////////////////////////////////////////////// TEST(CMakeTestPaths, ProjectSourcePath) { - gz::common::testing::CMakeTestPaths testPaths; + auto testPaths = TestPathFactory(kTestingProjectSourceDir); std::string sourceDir; - ASSERT_TRUE(testPaths.ProjectSourcePath(sourceDir)); + ASSERT_TRUE(testPaths->ProjectSourcePath(sourceDir)); ASSERT_FALSE(sourceDir.empty()); ASSERT_TRUE(exists(sourceDir)) << sourceDir; ASSERT_TRUE(isDirectory(sourceDir)); @@ -81,10 +81,10 @@ TEST(CMakeTestPaths, ProjectSourcePath) ///////////////////////////////////////////////// TEST(CMakeTestPaths, TestTmpPath) { - gz::common::testing::CMakeTestPaths testPaths; + auto testPaths = TestPathFactory(kTestingProjectSourceDir); std::string tmpDir; - ASSERT_TRUE(testPaths.TestTmpPath(tmpDir)); + ASSERT_TRUE(testPaths->TestTmpPath(tmpDir)); ASSERT_FALSE(tmpDir.empty()); ASSERT_TRUE(exists(tmpDir)) << tmpDir; ASSERT_TRUE(isDirectory(tmpDir)); From 93f2da739449fbc7b146eff1c471947953a8442f Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Thu, 9 Nov 2023 16:41:51 -0600 Subject: [PATCH 08/14] Fix hidden visibility win fix test (#557) Signed-off-by: Jose Luis Rivero Signed-off-by: Michael Carroll Co-authored-by: Jose Luis Rivero --- .../gz/common/testing/CMakeTestPaths.hh | 23 ++++--------------- .../include/gz/common/testing/TestPaths.hh | 9 ++++++-- testing/src/CMakeTestPaths.cc | 6 +++++ 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/testing/include/gz/common/testing/CMakeTestPaths.hh b/testing/include/gz/common/testing/CMakeTestPaths.hh index f37b566c..19fef93f 100644 --- a/testing/include/gz/common/testing/CMakeTestPaths.hh +++ b/testing/include/gz/common/testing/CMakeTestPaths.hh @@ -28,24 +28,12 @@ namespace gz::common::testing /// /// It is not intended that users will directly construct this, but rather /// utilize the TestPathFactory. - -/// TODO(jrivero) Remove warning disable when bumping MSVC on CI -/// MSVC v16.11.25 complains about the TestPaths class not having a DLL although -/// relevant members of it have visiblity defined: -/// "non dll-interface class 'gz::common::testing::TestPaths' used as base for -/// dll-interface class 'gz::common::testing::CMakeTestPaths'" -/// -/// Workaround on this problems triggers new warnings and suffering and -/// more recent versions of MSVC do not trigger that warning anymore. -/// Conclusion: disable the warning. -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable: 4275) -#endif class GZ_COMMON_TESTING_VISIBLE CMakeTestPaths: public TestPaths { - /// \brief Constructor from TestPaths - public: using TestPaths::TestPaths; + /// \brief Constructor + /// \param[in] _projectSourcePath Path to the root of the project source + public: explicit CMakeTestPaths( + const std::string &_projectSourcePath = kTestingProjectSourceDir); /// \brief Destructor public: ~CMakeTestPaths() override; @@ -57,7 +45,4 @@ class GZ_COMMON_TESTING_VISIBLE CMakeTestPaths: public TestPaths public: bool TestTmpPath(std::string &_tmpDir) override; }; } // namespace gz::common::testing -#ifdef _MSC_VER -# pragma warning( pop ) -#endif #endif // GZ_COMMON_TESTING_CMAKETESTPATHS_HH_ diff --git a/testing/include/gz/common/testing/TestPaths.hh b/testing/include/gz/common/testing/TestPaths.hh index b234a97b..00f95f52 100644 --- a/testing/include/gz/common/testing/TestPaths.hh +++ b/testing/include/gz/common/testing/TestPaths.hh @@ -26,6 +26,8 @@ #include "gz/common/testing/Export.hh" +#include + #ifndef TESTING_PROJECT_SOURCE_DIR #define TESTING_PROJECT_SOURCE_DIR "" #endif @@ -53,17 +55,18 @@ enum class GZ_COMMON_TESTING_VISIBLE BuildType kBazel }; + ////////////////////////////////////////////////// /// \brief Helper interface to generate path information to support /// test access to source/data files /// /// It is intended that there is an implementation of this interface for /// each relevant buildsystem. -class TestPaths +class GZ_COMMON_TESTING_VISIBLE TestPaths { /// \brief Constructor /// \param[in] _projectSourcePath Path to the root of the project source - public: explicit GZ_COMMON_TESTING_VISIBLE TestPaths( + public: explicit TestPaths( const std::string &_projectSourcePath = kTestingProjectSourceDir); /// \brief Destructor @@ -79,7 +82,9 @@ class TestPaths /// \return True if path successfully found and set, false otherwise public: virtual bool TestTmpPath(std::string &_tmpDir) = 0; +GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING protected: std::string projectSourcePath; +GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING }; ////////////////////////////////////////////////// diff --git a/testing/src/CMakeTestPaths.cc b/testing/src/CMakeTestPaths.cc index f17d26b8..f0b84250 100644 --- a/testing/src/CMakeTestPaths.cc +++ b/testing/src/CMakeTestPaths.cc @@ -20,6 +20,12 @@ namespace gz::common::testing { +////////////////////////////////////////////////// +CMakeTestPaths::CMakeTestPaths(const std::string &_projectSourcePath) + : TestPaths(_projectSourcePath) +{ +} + ////////////////////////////////////////////////// CMakeTestPaths::~CMakeTestPaths() = default; From e61ebc195caba7d68eb44a874f789945c3bab3ec Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Thu, 9 Nov 2023 16:50:50 -0600 Subject: [PATCH 09/14] Minimize diff Signed-off-by: Michael Carroll --- testing/include/gz/common/testing/CMakeTestPaths.hh | 2 +- testing/include/gz/common/testing/TestPaths.hh | 2 +- testing/src/CMakeTestPaths_TEST.cc | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/include/gz/common/testing/CMakeTestPaths.hh b/testing/include/gz/common/testing/CMakeTestPaths.hh index 40c1d7c1..19fef93f 100644 --- 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 CMakeTestPaths: public TestPaths +class GZ_COMMON_TESTING_VISIBLE CMakeTestPaths: public TestPaths { /// \brief Constructor /// \param[in] _projectSourcePath Path to the root of the project source diff --git a/testing/include/gz/common/testing/TestPaths.hh b/testing/include/gz/common/testing/TestPaths.hh index 00f95f52..a7d76a1a 100644 --- a/testing/include/gz/common/testing/TestPaths.hh +++ b/testing/include/gz/common/testing/TestPaths.hh @@ -55,7 +55,6 @@ enum class GZ_COMMON_TESTING_VISIBLE BuildType kBazel }; - ////////////////////////////////////////////////// /// \brief Helper interface to generate path information to support /// test access to source/data files @@ -83,6 +82,7 @@ class GZ_COMMON_TESTING_VISIBLE TestPaths public: virtual bool TestTmpPath(std::string &_tmpDir) = 0; GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING + /// \brief Path to the root of the project source protected: std::string projectSourcePath; GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING }; diff --git a/testing/src/CMakeTestPaths_TEST.cc b/testing/src/CMakeTestPaths_TEST.cc index fb5047a0..b9730ff4 100644 --- a/testing/src/CMakeTestPaths_TEST.cc +++ b/testing/src/CMakeTestPaths_TEST.cc @@ -61,10 +61,10 @@ TEST(CMakeTestPaths, TestBuildType) ///////////////////////////////////////////////// TEST(CMakeTestPaths, ProjectSourcePath) { - auto testPaths = TestPathFactory(kTestingProjectSourceDir); + gz::common::testing::CMakeTestPaths testPaths; std::string sourceDir; - ASSERT_TRUE(testPaths->ProjectSourcePath(sourceDir)); + ASSERT_TRUE(testPaths.ProjectSourcePath(sourceDir)); ASSERT_FALSE(sourceDir.empty()); ASSERT_TRUE(exists(sourceDir)) << sourceDir; ASSERT_TRUE(isDirectory(sourceDir)); @@ -81,10 +81,10 @@ TEST(CMakeTestPaths, ProjectSourcePath) ///////////////////////////////////////////////// TEST(CMakeTestPaths, TestTmpPath) { - auto testPaths = TestPathFactory(kTestingProjectSourceDir); + gz::common::testing::CMakeTestPaths testPaths; std::string tmpDir; - ASSERT_TRUE(testPaths->TestTmpPath(tmpDir)); + ASSERT_TRUE(testPaths.TestTmpPath(tmpDir)); ASSERT_FALSE(tmpDir.empty()); ASSERT_TRUE(exists(tmpDir)) << tmpDir; ASSERT_TRUE(isDirectory(tmpDir)); From 7eb756fb1b6971e07846b00c1264642db4596e97 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Thu, 9 Nov 2023 17:30:56 -0600 Subject: [PATCH 10/14] Remove deleted destructor Signed-off-by: Michael Carroll --- testing/src/TestPaths.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/testing/src/TestPaths.cc b/testing/src/TestPaths.cc index af6cd036..d2eca373 100644 --- a/testing/src/TestPaths.cc +++ b/testing/src/TestPaths.cc @@ -29,9 +29,6 @@ TestPaths::TestPaths(const std::string &_projectSourcePath) { } -////////////////////////////////////////////////// -TestPaths::~TestPaths() = default; - ////////////////////////////////////////////////// BuildType TestBuildType(const std::string &_projectSourcePath) { From 24826b74a63d123aff7144b0cac24baf2c24b7f6 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Thu, 9 Nov 2023 17:40:44 -0600 Subject: [PATCH 11/14] Revert "Remove deleted destructor" This reverts commit 7eb756fb1b6971e07846b00c1264642db4596e97. --- testing/src/TestPaths.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testing/src/TestPaths.cc b/testing/src/TestPaths.cc index d2eca373..af6cd036 100644 --- a/testing/src/TestPaths.cc +++ b/testing/src/TestPaths.cc @@ -29,6 +29,9 @@ TestPaths::TestPaths(const std::string &_projectSourcePath) { } +////////////////////////////////////////////////// +TestPaths::~TestPaths() = default; + ////////////////////////////////////////////////// BuildType TestBuildType(const std::string &_projectSourcePath) { From 52a7816cf12b63a95616858086873fcf564ee52e Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 6 Nov 2023 19:15:36 +0100 Subject: [PATCH 12/14] Enable HIDE_SYMBOLS_BY_DEFAULT Signed-off-by: Jose Luis Rivero --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f79a98e..26ebe187 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,6 +132,7 @@ configure_file("${PROJECT_SOURCE_DIR}/cppcheck.suppress.in" ${PROJECT_BINARY_DIR}/cppcheck.suppress) gz_configure_build(QUIT_IF_BUILD_ERRORS + HIDE_SYMBOLS_BY_DEFAULT COMPONENTS av events geospatial graphics io profiler testing) #============================================================================ From 56bd6fd73f451ca13c1a32c59d77de72df4aab1b Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 30 Oct 2023 20:27:52 +0100 Subject: [PATCH 13/14] Add missing visibility declarations (#548) Signed-off-by: Jose Luis Rivero --- profiler/src/RemoteryProfilerImpl.cc | 2 ++ src/SignalHandler.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/profiler/src/RemoteryProfilerImpl.cc b/profiler/src/RemoteryProfilerImpl.cc index b233adfe..7f1954a4 100644 --- a/profiler/src/RemoteryProfilerImpl.cc +++ b/profiler/src/RemoteryProfilerImpl.cc @@ -16,6 +16,7 @@ */ #include "gz/common/config.hh" +#include #include "RemoteryProfilerImpl.hh" #include "gz/common/Console.hh" @@ -24,6 +25,7 @@ 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 index 7ad81d81..07b6d054 100644 --- 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. -std::map> gOnSignalWrappers; +GZ_COMMON_VISIBLE std::map> gOnSignalWrappers; std::mutex gWrapperMutex; ///////////////////////////////////////////////// From 097ee0bc10dd7e82db7727d516748e6cd33f3855 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Fri, 10 Nov 2023 15:00:13 +0000 Subject: [PATCH 14/14] Change pure virtual to virtual destructor Signed-off-by: Michael Carroll --- testing/include/gz/common/testing/TestPaths.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/include/gz/common/testing/TestPaths.hh b/testing/include/gz/common/testing/TestPaths.hh index a7d76a1a..4a15b6ba 100644 --- a/testing/include/gz/common/testing/TestPaths.hh +++ b/testing/include/gz/common/testing/TestPaths.hh @@ -69,7 +69,7 @@ class GZ_COMMON_TESTING_VISIBLE TestPaths const std::string &_projectSourcePath = kTestingProjectSourceDir); /// \brief Destructor - public: virtual ~TestPaths() = 0; + public: virtual ~TestPaths(); /// brief Populate the path to the root project source directory /// \param[out] _sourceDir path to the root project source directory