Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
  • Loading branch information
mjcarroll and azeey committed Nov 8, 2023
1 parent c2cbfbf commit f4b52f8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 7 additions & 5 deletions testing/include/gz/common/testing/CMakeTestPaths.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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 @@ -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;
Expand Down

0 comments on commit f4b52f8

Please sign in to comment.