Commit aa34ae25 authored by kosak's avatar kosak
Browse files

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

parent 2d3543f8
...@@ -784,7 +784,7 @@ class ImplicitlyConvertible { ...@@ -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
......
...@@ -414,8 +414,6 @@ TEST(PrintCStringTest, EscapesProperly) { ...@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment