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

2013-12-03 01:36:29 +00:00
parent 2d3543f81d
commit aa34ae2508
2 changed files with 1 additions and 3 deletions
--- 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