Skip to content

Commit

Permalink
My attempt at fixing vis
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
  • Loading branch information
mjcarroll committed Nov 8, 2023
1 parent c604202 commit 5f5cabf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 19 deletions.
17 changes: 0 additions & 17 deletions testing/include/gz/common/testing/CMakeTestPaths.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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_
4 changes: 2 additions & 2 deletions testing/include/gz/common/testing/TestPaths.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5f5cabf

Please sign in to comment.