diff options
| author | srz_zumix <zumix.cpp@gmail.com> | 2020-08-02 00:18:13 (GMT) |
|---|---|---|
| committer | srz_zumix <zumix.cpp@gmail.com> | 2020-08-02 00:18:13 (GMT) |
| commit | 7d470772455112cfd1a0021f6853826d5e79af94 (patch) | |
| tree | e1f2aa5d9a74f2c08408946379e7550e1fc5f90a /googletest/include/gtest/internal/gtest-internal.h | |
| parent | 317ec2f296393ba30631e4ec2c7b3a6cbec08950 (diff) | |
| download | googletest-7d470772455112cfd1a0021f6853826d5e79af94.zip googletest-7d470772455112cfd1a0021f6853826d5e79af94.tar.gz googletest-7d470772455112cfd1a0021f6853826d5e79af94.tar.bz2 | |
fix tests
Diffstat (limited to 'googletest/include/gtest/internal/gtest-internal.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index d09ac0a..cbdb3f2 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -520,6 +520,7 @@ struct SuiteApiResolver : T { static SetUpTearDownSuiteFuncType GetSetUpCaseOrSuite(const char* filename, int line_num) { +#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_ SetUpTearDownSuiteFuncType test_case_fp = GetNotDefaultOrNull(&T::SetUpTestCase, &Test::SetUpTestCase); SetUpTearDownSuiteFuncType test_suite_fp = @@ -531,10 +532,16 @@ struct SuiteApiResolver : T { << filename << ":" << line_num; return test_case_fp != nullptr ? test_case_fp : test_suite_fp; +#else + (void)(filename); + (void)(line_num); + return &T::SetUpTestSuite; +#endif } static SetUpTearDownSuiteFuncType GetTearDownCaseOrSuite(const char* filename, int line_num) { +#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_ SetUpTearDownSuiteFuncType test_case_fp = GetNotDefaultOrNull(&T::TearDownTestCase, &Test::TearDownTestCase); SetUpTearDownSuiteFuncType test_suite_fp = @@ -546,6 +553,11 @@ struct SuiteApiResolver : T { << filename << ":" << line_num; return test_case_fp != nullptr ? test_case_fp : test_suite_fp; +#else + (void)(filename); + (void)(line_num); + return &T::TearDownTestSuite; +#endif } }; |