diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-10-17 17:07:51 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-10-17 17:07:51 (GMT) |
| commit | 2995ca563d76811be04ff23d554012415ac16915 (patch) | |
| tree | bcc055d6c20b0387cd33ef15ee80388f01e494e1 /googletest/include | |
| parent | bdc29d5dc19dd802907ea37a80ce5dc9afe0898d (diff) | |
| parent | 3cddd56e195b516f449bea6dcd3edd4494195631 (diff) | |
| download | googletest-2995ca563d76811be04ff23d554012415ac16915.zip googletest-2995ca563d76811be04ff23d554012415ac16915.tar.gz googletest-2995ca563d76811be04ff23d554012415ac16915.tar.bz2 | |
Merge pull request #2507 from roblub:master
PiperOrigin-RevId: 275076905
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/gtest-typed-test.h | 4 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/googletest/include/gtest/gtest-typed-test.h b/googletest/include/gtest/gtest-typed-test.h index 095ce05..6b7c9c8 100644 --- a/googletest/include/gtest/gtest-typed-test.h +++ b/googletest/include/gtest/gtest-typed-test.h @@ -201,7 +201,7 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes); private: \ typedef CaseName<gtest_TypeParam_> TestFixture; \ typedef gtest_TypeParam_ TypeParam; \ - virtual void TestBody(); \ + void TestBody() override; \ }; \ static bool gtest_##CaseName##_##TestName##_registered_ \ GTEST_ATTRIBUTE_UNUSED_ = \ @@ -276,7 +276,7 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes); private: \ typedef SuiteName<gtest_TypeParam_> TestFixture; \ typedef gtest_TypeParam_ TypeParam; \ - virtual void TestBody(); \ + void TestBody() override; \ }; \ static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \ GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).AddTestName( \ diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index f6433c5..2b4770f 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -1590,7 +1590,7 @@ class ThreadLocal : public ThreadLocalBase { class DefaultValueHolderFactory : public ValueHolderFactory { public: DefaultValueHolderFactory() {} - virtual ValueHolder* MakeNewHolder() const { return new ValueHolder(); } + ValueHolder* MakeNewHolder() const override { return new ValueHolder(); } private: GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory); @@ -1599,7 +1599,7 @@ class ThreadLocal : public ThreadLocalBase { class InstanceValueHolderFactory : public ValueHolderFactory { public: explicit InstanceValueHolderFactory(const T& value) : value_(value) {} - virtual ValueHolder* MakeNewHolder() const { + ValueHolder* MakeNewHolder() const override { return new ValueHolder(value_); } |