gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete whitespace, and change the return type of ImplicitlyConvertible::MakeFrom() to From&.

Browse Source
This commit is contained in:
kosak
2013-12-03 01:36:29 +00:00
parent 2d3543f81d
commit aa34ae2508
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/gtest/internal/gtest-internal.h
View File

@@ -784,7 +784,7 @@ class ImplicitlyConvertible {
// MakeFrom() is an expression whose type is From. We cannot simply // MakeFrom() is an expression whose type is From. We cannot simply
// use From(), as the type From may not have a public default // use From(), as the type From may not have a public default
// constructor. // constructor.
static From MakeFrom(); static typename AddReference<From>::type MakeFrom();
// These two functions are overloaded. Given an expression // These two functions are overloaded. Given an expression
// Helper(x), the compiler will pick the first version if x can be // Helper(x), the compiler will pick the first version if x can be

2
test/gtest-printers_test.cc
View File

@@ -414,8 +414,6 @@ TEST(PrintCStringTest, EscapesProperly) {
Print(p)); Print(p));
} }
// MSVC compiler can be configured to define whar_t as a typedef // 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 // of unsigned short. Defining an overload for const wchar_t* in that case
// would cause pointers to unsigned shorts be printed as wide strings, // would cause pointers to unsigned shorts be printed as wide strings,