From 5f5cabf613c278955994b4aed60bd495ee9efac3 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Wed, 8 Nov 2023 19:15:47 +0000 Subject: [PATCH] My attempt at fixing vis Signed-off-by: Michael Carroll --- .../include/gz/common/testing/CMakeTestPaths.hh | 17 ----------------- testing/include/gz/common/testing/TestPaths.hh | 4 ++-- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/testing/include/gz/common/testing/CMakeTestPaths.hh b/testing/include/gz/common/testing/CMakeTestPaths.hh index f37b566c..0ce2471a 100644 --- a/testing/include/gz/common/testing/CMakeTestPaths.hh +++ b/testing/include/gz/common/testing/CMakeTestPaths.hh @@ -28,20 +28,6 @@ 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 @@ -57,7 +43,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..5f660eba 100644 --- a/testing/include/gz/common/testing/TestPaths.hh +++ b/testing/include/gz/common/testing/TestPaths.hh @@ -59,11 +59,11 @@ enum class GZ_COMMON_TESTING_VISIBLE BuildType /// /// 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