aboutsummaryrefslogtreecommitdiffstats
path: root/test/gmock-cardinalities_test.cc
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
commit32de5f53763125925e078498250f7e73a88de9ed (patch)
treecb5de0206e38598a12f10403de146faadcf9cdb0 /test/gmock-cardinalities_test.cc
parent284b54d3047254a8787e4f5eb9ba62a866caaabd (diff)
downloadgoogletest-32de5f53763125925e078498250f7e73a88de9ed.tar.gz
googletest-32de5f53763125925e078498250f7e73a88de9ed.tar.bz2
googletest-32de5f53763125925e078498250f7e73a88de9ed.zip
Fixes a slew of compiler warnings and turns on "warning as error" in the scons build.
Diffstat (limited to 'test/gmock-cardinalities_test.cc')
-rw-r--r--test/gmock-cardinalities_test.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/gmock-cardinalities_test.cc b/test/gmock-cardinalities_test.cc
index f3f1e106..f6a94916 100644
--- a/test/gmock-cardinalities_test.cc
+++ b/test/gmock-cardinalities_test.cc
@@ -52,7 +52,11 @@ using testing::MakeCardinality;
class MockFoo {
public:
+ MockFoo() {}
MOCK_METHOD0(Bar, int()); // NOLINT
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
};
// Tests that Cardinality objects can be default constructed.
@@ -398,7 +402,9 @@ class EvenCardinality : public CardinalityInterface {
}
// Returns true iff call_count calls will saturate this cardinality.
- virtual bool IsSaturatedByCallCount(int call_count) const { return false; }
+ virtual bool IsSaturatedByCallCount(int /* call_count */) const {
+ return false;
+ }
// Describes self to an ostream.
virtual void DescribeTo(::std::ostream* ss) const {