Skip to content

Commit

Permalink
-Wsuggest-override (#512)
Browse files Browse the repository at this point in the history
  • Loading branch information
srz-zumix committed Oct 3, 2020
1 parent 0e0fd6f commit 1d74bc7
Show file tree
Hide file tree
Showing 48 changed files with 783 additions and 626 deletions.
8 changes: 8 additions & 0 deletions include/gtest/iutest_switch_for_gtest.hpp
Expand Up @@ -60,6 +60,9 @@ using ::std::get;
#include "../iutest_ver.hpp"

// gtest 1.5 or less compatible
#if !defined(IUTEST_HAS_CONCEPTS)
# define IUTEST_HAS_CONCEPTS 0
#endif
#if !IUTEST_HAS_CONCEPTS
#include <gtest/internal/gtest-internal.h>
#define GTestStreamToHelper GTestStreamToHelperForCompatible
Expand Down Expand Up @@ -143,6 +146,8 @@ void GTestStreamToHelper(std::ostream* os, const T& val);

#undef IUTEST_HAS_STREAM_BUFFER

#undef IUTEST_HAS_STD_FILESYSTEM

#undef IUTEST_OPERAND
#undef IUTEST_EXPRESSION

Expand Down Expand Up @@ -205,6 +210,8 @@ void GTestStreamToHelper(std::ostream* os, const T& val);
# define IUTEST_HAS_STREAM_RESULT 1
#endif

#define IUTEST_HAS_STD_FILESYSTEM 0

#define IUTEST_HAS_STREAM_BUFFER 0

#define IUTEST_HAS_VARIADIC_TEMPLATES 0
Expand Down Expand Up @@ -234,6 +241,7 @@ void GTestStreamToHelper(std::ostream* os, const T& val);
#endif

#include "../internal/iutest_compiler.hpp"
#include "../internal/iutest_stdlib_defs.hpp"
#include "../internal/iutest_type_traits.hpp"
#include "../internal/iutest_compatible_defs.hpp"

Expand Down
2 changes: 1 addition & 1 deletion include/gtest/switch/iutest_switch_inform.hpp
Expand Up @@ -258,7 +258,7 @@ namespace inform_support
class DefaultPrinter : public ::testing::EmptyTestEventListener
{
private:
virtual void OnTestPartResult(const TestPartResult& test_part_result)
virtual void OnTestPartResult(const TestPartResult& test_part_result) IUTEST_CXX_OVERRIDE
{
if( ::testing::UnitTest::GetInstance()->listeners().default_result_printer() == NULL )
{
Expand Down
2 changes: 1 addition & 1 deletion include/gtest/switch/iutest_switch_no_failure.hpp
Expand Up @@ -81,7 +81,7 @@ class HasNewFailureHelper : public HasNewFatalFailureHelper
{
}
public:
virtual void ReportTestPartResult(const TestPartResult& result)
virtual void ReportTestPartResult(const TestPartResult& result) IUTEST_CXX_OVERRIDE
{
if( result.failed() )
{
Expand Down

0 comments on commit 1d74bc7

Please sign in to comment.