diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-10 16:45:59 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-10 16:45:59 -0500 |
| commit | 481fe9446a1dc83741a3d4143eedd40e3cb45858 (patch) | |
| tree | 941b887e1df61f4590c34bdef0f29ca25a1841e2 /googletest/include/gtest/gtest-message.h | |
| parent | 84aa45941fdf7b71e280152456f1268b0b961599 (diff) | |
| download | googletest-481fe9446a1dc83741a3d4143eedd40e3cb45858.tar.gz googletest-481fe9446a1dc83741a3d4143eedd40e3cb45858.tar.bz2 googletest-481fe9446a1dc83741a3d4143eedd40e3cb45858.zip | |
More merge, cleanup
Diffstat (limited to 'googletest/include/gtest/gtest-message.h')
| -rw-r--r-- | googletest/include/gtest/gtest-message.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googletest/include/gtest/gtest-message.h b/googletest/include/gtest/gtest-message.h index fe879bca..fed61527 100644 --- a/googletest/include/gtest/gtest-message.h +++ b/googletest/include/gtest/gtest-message.h @@ -113,7 +113,7 @@ class GTEST_API_ Message { // Streams a non-pointer value to this object. template <typename T> inline Message& operator <<(const T& val) { - // Some libraries overload << for STL containers. These + // Some libraries overloads << for STL containers. These // overloads are defined in the global namespace instead of ::std. // // C++'s symbol lookup rule (i.e. Koenig lookup) says that these @@ -196,7 +196,6 @@ class GTEST_API_ Message { std::string GetString() const; private: - #if GTEST_OS_SYMBIAN // These are needed as the Nokia Symbian Compiler cannot decide between // const T& and const T* in a function template. The Nokia compiler _can_ |