diff options
| author | kosak <kosak@google.com> | 2013-12-03 01:36:29 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2013-12-03 01:36:29 +0000 |
| commit | aa34ae250800af7e98499abba44636503cf99b16 (patch) | |
| tree | de1e7b5970a224c44b6a08739cdf8193ce3b6e27 | |
| parent | 2d3543f81d6d4583332f8b60768ade18e0f96220 (diff) | |
| download | googletest-aa34ae250800af7e98499abba44636503cf99b16.tar.gz googletest-aa34ae250800af7e98499abba44636503cf99b16.tar.bz2 googletest-aa34ae250800af7e98499abba44636503cf99b16.zip | |
Delete whitespace, and change the return type of ImplicitlyConvertible::MakeFrom() to From&.
| -rw-r--r-- | include/gtest/internal/gtest-internal.h | 2 | ||||
| -rw-r--r-- | test/gtest-printers_test.cc | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h index 0dcc3a31..f58f65f6 100644 --- a/include/gtest/internal/gtest-internal.h +++ b/include/gtest/internal/gtest-internal.h @@ -784,7 +784,7 @@ class ImplicitlyConvertible { // MakeFrom() is an expression whose type is From. We cannot simply // use From(), as the type From may not have a public default // constructor. - static From MakeFrom(); + static typename AddReference<From>::type MakeFrom(); // These two functions are overloaded. Given an expression // Helper(x), the compiler will pick the first version if x can be diff --git a/test/gtest-printers_test.cc b/test/gtest-printers_test.cc index c2beca7d..184f9d9f 100644 --- a/test/gtest-printers_test.cc +++ b/test/gtest-printers_test.cc @@ -414,8 +414,6 @@ TEST(PrintCStringTest, EscapesProperly) { Print(p)); } - - // MSVC compiler can be configured to define whar_t as a typedef // of unsigned short. Defining an overload for const wchar_t* in that case // would cause pointers to unsigned shorts be printed as wide strings, |