gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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).

Browse Source
This commit is contained in:
zhanyong.wan
2011-02-01 00:00:03 +00:00
parent a684b5a526
commit 5b61ce3ee5
7 changed files with 62 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/gmock/gmock-generated-nice-strict.h.pump
View File

@@ -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: