diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-11-04 17:56:23 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-11-04 17:56:23 +0000 |
| commit | 93fed47dbf8e6bc3d39d3f769cb5039551747257 (patch) | |
| tree | ab0e0f5e0fd23697673ec2e0edca67079375dd2c /include/gtest/gtest.h | |
| parent | f46f3eaf059b7b3ca00a3428c594bd477bc1839c (diff) | |
| download | googletest-93fed47dbf8e6bc3d39d3f769cb5039551747257.tar.gz | |
Improves conformance to the Google C++ Style Guide (by Greg Miller).
git-svn-id: http://googletest.googlecode.com/svn/trunk@607 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include/gtest/gtest.h')
| -rw-r--r-- | include/gtest/gtest.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index c196990..2d570a2 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -52,6 +52,7 @@ #define GTEST_INCLUDE_GTEST_GTEST_H_ #include <limits> +#include <ostream> #include <vector> #include "gtest/internal/gtest-internal.h" @@ -672,7 +673,6 @@ class GTEST_API_ TestInfo { const TestResult* result() const { return &result_; } private: - #if GTEST_HAS_DEATH_TEST friend class internal::DefaultDeathTestFactory; #endif // GTEST_HAS_DEATH_TEST @@ -1456,11 +1456,11 @@ GTEST_IMPL_CMP_HELPER_(NE, !=); // Implements the helper function for {ASSERT|EXPECT}_LE GTEST_IMPL_CMP_HELPER_(LE, <=); // Implements the helper function for {ASSERT|EXPECT}_LT -GTEST_IMPL_CMP_HELPER_(LT, < ); +GTEST_IMPL_CMP_HELPER_(LT, <); // Implements the helper function for {ASSERT|EXPECT}_GE GTEST_IMPL_CMP_HELPER_(GE, >=); // Implements the helper function for {ASSERT|EXPECT}_GT -GTEST_IMPL_CMP_HELPER_(GT, > ); +GTEST_IMPL_CMP_HELPER_(GT, >); #undef GTEST_IMPL_CMP_HELPER_ |