From aa34ae250800af7e98499abba44636503cf99b16 Mon Sep 17 00:00:00 2001 From: kosak Date: Tue, 3 Dec 2013 01:36:29 +0000 Subject: Delete whitespace, and change the return type of ImplicitlyConvertible::MakeFrom() to From&. --- include/gtest/internal/gtest-internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/gtest/internal/gtest-internal.h') 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::type MakeFrom(); // These two functions are overloaded. Given an expression // Helper(x), the compiler will pick the first version if x can be -- cgit v1.2.3