diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-01-08 02:35:11 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-01-08 02:35:11 +0000 |
| commit | 95afefe85311353fd4b7350091c4b8dfb62b8c48 (patch) | |
| tree | f26ca7d5145827f5f6054474fb9a56e3e5311855 | |
| parent | f26e19a0a5162a0914b4c0e33429c1e8aa6481af (diff) | |
| download | googletest-95afefe85311353fd4b7350091c4b8dfb62b8c48.tar.gz | |
Change an example to use 'override' rather than 'virtual'. Add missing headers for 'connect' and 'socket'.
git-svn-id: http://googletest.googlecode.com/svn/trunk@701 861a406c-534a-0410-8894-cb66d6ee9925
| -rw-r--r-- | include/gtest/gtest.h | 4 | ||||
| -rw-r--r-- | src/gtest.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index d7e3e26..71d552e 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 dc06e02..64ab767 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -128,6 +128,8 @@ #if GTEST_CAN_STREAM_RESULTS_ # include <arpa/inet.h> // NOLINT # include <netdb.h> // NOLINT +# include <sys/socket.h> // NOLINT +# include <sys/types.h> // NOLINT #endif // Indicates that this translation unit is part of Google Test's |