Picks up gtest r536; renames implicit_cast and down_cast to reduce the chance of clash (by Roman Perepelitsa); enables gmock_gen.py to handle storage specifiers (by Steve Fox).

2011-02-01 00:00:03 +00:00
parent a684b5a526
commit 5b61ce3ee5
7 changed files with 62 additions and 40 deletions
--- a/include/gmock/gmock-spec-builders.h
+++ b/include/gmock/gmock-spec-builders.h
@@ -1388,7 +1388,7 @@ class FunctionMockerBase : public UntypedFunctionMockerBase {
      mock_obj_ = mock_obj;
    }
    Mock::Register(mock_obj, this);
-    return *::testing::internal::down_cast<FunctionMocker<F>*>(this);
+    return *::testing::internal::DownCast_<FunctionMocker<F>*>(this);
  }

  // The following two functions are from UntypedFunctionMockerBase.