diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-12-01 19:42:25 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-12-01 19:42:25 +0000 |
| commit | f6d6a22b8eea931b49a8c33de3092d4623ed0d41 (patch) | |
| tree | a0608d2270992b90160a57c68014fb65ade117df /include | |
| parent | 19eb9e9e3d4d5a4f0eee786d7664ca0e45137390 (diff) | |
| download | googletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.tar.gz googletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.tar.bz2 googletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.zip | |
Fixes Cygwin compatibility (by Vlad Losev); Improves Python tests (by Vlad Losev); Fixes ambiguous call to implicit_cast; Uses gtest's SkipPrefix() instead gmock's own (by Vlad Losev).
Diffstat (limited to 'include')
| -rw-r--r-- | include/gmock/internal/gmock-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gmock/internal/gmock-port.h b/include/gmock/internal/gmock-port.h index 0cff73fe..649f838f 100644 --- a/include/gmock/internal/gmock-port.h +++ b/include/gmock/internal/gmock-port.h @@ -123,7 +123,7 @@ inline To down_cast(From* f) { // so we only accept pointers // completely. if (false) { const To to = NULL; - implicit_cast<From*>(to); + ::testing::internal::implicit_cast<From*>(to); } #if GTEST_HAS_RTTI |