summaryrefslogtreecommitdiff
path: root/include/gmock/gmock-generated-nice-strict.h
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-12-23 00:13:23 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-12-23 00:13:23 +0000
commit5ff8357ea9b0a7597feb311a1caffc060e892413 (patch)
treecb5de0206e38598a12f10403de146faadcf9cdb0 /include/gmock/gmock-generated-nice-strict.h
parent82505637faf3295b96d9f2c207865378989b8d5f (diff)
downloadgooglemock-5ff8357ea9b0a7597feb311a1caffc060e892413.tar.gz
Fixes a slew of compiler warnings and turns on "warning as error" in the scons build.
git-svn-id: http://googlemock.googlecode.com/svn/trunk@252 8415998a-534a-0410-bf83-d39667b30386
Diffstat (limited to 'include/gmock/gmock-generated-nice-strict.h')
-rw-r--r--include/gmock/gmock-generated-nice-strict.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/gmock/gmock-generated-nice-strict.h b/include/gmock/gmock-generated-nice-strict.h
index fc9a81b..435467f 100644
--- a/include/gmock/gmock-generated-nice-strict.h
+++ b/include/gmock/gmock-generated-nice-strict.h
@@ -155,6 +155,9 @@ class NiceMock : public MockClass {
::testing::Mock::UnregisterCallReaction(
internal::implicit_cast<MockClass*>(this));
}
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(NiceMock);
};
template <class MockClass>
@@ -246,6 +249,9 @@ class StrictMock : public MockClass {
::testing::Mock::UnregisterCallReaction(
internal::implicit_cast<MockClass*>(this));
}
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(StrictMock);
};
// The following specializations catch some (relatively more common)