diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2011-02-01 00:00:03 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2011-02-01 00:00:03 +0000 |
| commit | 5b61ce3ee5b15e6356487dd97236bf663a96a391 (patch) | |
| tree | 20aab5205844d171c2fb89eba88404a1e5f047eb /include/gmock/gmock-spec-builders.h | |
| parent | a684b5a5269e3f9c53ef842bf9b9658370418a0c (diff) | |
| download | googletest-5b61ce3ee5b15e6356487dd97236bf663a96a391.tar.gz googletest-5b61ce3ee5b15e6356487dd97236bf663a96a391.tar.bz2 googletest-5b61ce3ee5b15e6356487dd97236bf663a96a391.zip | |
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).
Diffstat (limited to 'include/gmock/gmock-spec-builders.h')
| -rw-r--r-- | include/gmock/gmock-spec-builders.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h index 1676056c..df2aef16 100644 --- 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. |