From c2101c28771d8abd0f2e057cdbdc26b7a05fad2d Mon Sep 17 00:00:00 2001 From: kosak Date: Thu, 8 Jan 2015 02:35:11 +0000 Subject: [PATCH] Change an example to use 'override' rather than 'virtual'. Add missing headers for 'connect' and 'socket'. --- include/gtest/gtest.h | 4 ++-- src/gtest.cc | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index d7e3e264..71d552e1 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -359,8 +359,8 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg); // // class FooTest : public testing::Test { // protected: -// virtual void SetUp() { ... } -// virtual void TearDown() { ... } +// void SetUp() override { ... } +// void TearDown() override { ... } // ... // }; // diff --git a/src/gtest.cc b/src/gtest.cc index dc06e022..64ab7670 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -128,6 +128,8 @@ #if GTEST_CAN_STREAM_RESULTS_ # include // NOLINT # include // NOLINT +# include // NOLINT +# include // NOLINT #endif // Indicates that this translation unit is part of Google Test's