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 | |
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')
-rw-r--r-- | include/gmock/gmock-actions.h | 4 | ||||
-rw-r--r-- | include/gmock/gmock-generated-nice-strict.h | 48 | ||||
-rw-r--r-- | include/gmock/gmock-generated-nice-strict.h.pump | 16 | ||||
-rw-r--r-- | include/gmock/gmock-spec-builders.h | 2 |
4 files changed, 35 insertions, 35 deletions
diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h index 215af4f9..f88ac80d 100644 --- a/include/gmock/gmock-actions.h +++ b/include/gmock/gmock-actions.h @@ -494,11 +494,11 @@ class ReturnAction { // single-argument constructor (e.g. Result is std::vector<int>) and R // has a type conversion operator template. In that case, value_(value) // won't compile as the compiler doesn't known which constructor of - // Result to call. implicit_cast forces the compiler to convert R to + // Result to call. ImplicitCast_ forces the compiler to convert R to // Result without considering explicit constructors, thus resolving the // ambiguity. value_ is then initialized using its copy constructor. explicit Impl(R value) - : value_(::testing::internal::implicit_cast<Result>(value)) {} + : value_(::testing::internal::ImplicitCast_<Result>(value)) {} virtual Result Perform(const ArgumentTuple&) { return value_; } diff --git a/include/gmock/gmock-generated-nice-strict.h b/include/gmock/gmock-generated-nice-strict.h index 4fb69fdc..6099e81e 100644 --- a/include/gmock/gmock-generated-nice-strict.h +++ b/include/gmock/gmock-generated-nice-strict.h @@ -71,7 +71,7 @@ class NiceMock : public MockClass { // we have to avoid a possible clash with members of MockClass. NiceMock() { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } // C++ doesn't (yet) allow inheritance of constructors, so we have @@ -79,32 +79,32 @@ class NiceMock : public MockClass { template <typename A1> explicit NiceMock(const A1& a1) : MockClass(a1) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2> NiceMock(const A1& a1, const A2& a2) : MockClass(a1, a2) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3> NiceMock(const A1& a1, const A2& a2, const A3& a3) : MockClass(a1, a2, a3) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4> NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4) : MockClass(a1, a2, a3, a4) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5> NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5) : MockClass(a1, a2, a3, a4, a5) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5, @@ -112,7 +112,7 @@ class NiceMock : public MockClass { NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5, const A6& a6) : MockClass(a1, a2, a3, a4, a5, a6) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5, @@ -121,7 +121,7 @@ class NiceMock : public MockClass { const A5& a5, const A6& a6, const A7& a7) : MockClass(a1, a2, a3, a4, a5, a6, a7) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5, @@ -130,7 +130,7 @@ class NiceMock : public MockClass { const A5& a5, const A6& a6, const A7& a7, const A8& a8) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5, @@ -139,7 +139,7 @@ class NiceMock : public MockClass { const A5& a5, const A6& a6, const A7& a7, const A8& a8, const A9& a9) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5, @@ -148,12 +148,12 @@ class NiceMock : public MockClass { const A5& a5, const A6& a6, const A7& a7, const A8& a8, const A9& a9, const A10& a10) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } virtual ~NiceMock() { ::testing::Mock::UnregisterCallReaction( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } private: @@ -167,38 +167,38 @@ class StrictMock : public MockClass { // we have to avoid a possible clash with members of MockClass. StrictMock() { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1> explicit StrictMock(const A1& a1) : MockClass(a1) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2> StrictMock(const A1& a1, const A2& a2) : MockClass(a1, a2) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3> StrictMock(const A1& a1, const A2& a2, const A3& a3) : MockClass(a1, a2, a3) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4> StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4) : MockClass(a1, a2, a3, a4) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5> StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5) : MockClass(a1, a2, a3, a4, a5) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5, @@ -206,7 +206,7 @@ class StrictMock : public MockClass { StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5, const A6& a6) : MockClass(a1, a2, a3, a4, a5, a6) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5, @@ -215,7 +215,7 @@ class StrictMock : public MockClass { const A5& a5, const A6& a6, const A7& a7) : MockClass(a1, a2, a3, a4, a5, a6, a7) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5, @@ -224,7 +224,7 @@ class StrictMock : public MockClass { const A5& a5, const A6& a6, const A7& a7, const A8& a8) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5, @@ -233,7 +233,7 @@ class StrictMock : public MockClass { const A5& a5, const A6& a6, const A7& a7, const A8& a8, const A9& a9) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1, typename A2, typename A3, typename A4, typename A5, @@ -242,12 +242,12 @@ class StrictMock : public MockClass { const A5& a5, const A6& a6, const A7& a7, const A8& a8, const A9& a9, const A10& a10) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } virtual ~StrictMock() { ::testing::Mock::UnregisterCallReaction( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } private: diff --git a/include/gmock/gmock-generated-nice-strict.h.pump b/include/gmock/gmock-generated-nice-strict.h.pump index 784635bd..b7964db3 100644 --- a/include/gmock/gmock-generated-nice-strict.h.pump +++ b/include/gmock/gmock-generated-nice-strict.h.pump @@ -74,7 +74,7 @@ class NiceMock : public MockClass { // we have to avoid a possible clash with members of MockClass. NiceMock() { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } // C++ doesn't (yet) allow inheritance of constructors, so we have @@ -82,7 +82,7 @@ class NiceMock : public MockClass { template <typename A1> explicit NiceMock(const A1& a1) : MockClass(a1) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } $range i 2..n @@ -91,14 +91,14 @@ $range j 1..i template <$for j, [[typename A$j]]> NiceMock($for j, [[const A$j& a$j]]) : MockClass($for j, [[a$j]]) { ::testing::Mock::AllowUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } ]] virtual ~NiceMock() { ::testing::Mock::UnregisterCallReaction( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } private: @@ -112,13 +112,13 @@ class StrictMock : public MockClass { // we have to avoid a possible clash with members of MockClass. StrictMock() { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } template <typename A1> explicit StrictMock(const A1& a1) : MockClass(a1) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } $for i [[ @@ -126,14 +126,14 @@ $range j 1..i template <$for j, [[typename A$j]]> StrictMock($for j, [[const A$j& a$j]]) : MockClass($for j, [[a$j]]) { ::testing::Mock::FailUninterestingCalls( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } ]] virtual ~StrictMock() { ::testing::Mock::UnregisterCallReaction( - internal::implicit_cast<MockClass*>(this)); + internal::ImplicitCast_<MockClass*>(this)); } private: 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. |