| Index: testing/gmock/test/gmock-cardinalities_test.cc
|
| diff --git a/testing/gmock/test/gmock-cardinalities_test.cc b/testing/gmock/test/gmock-cardinalities_test.cc
|
| index f3f1e1064fa203d6349c843ea2be3f241cf60108..f6a94916ff340fc6917ab01787ffd9493e5ccd11 100644
|
| --- a/testing/gmock/test/gmock-cardinalities_test.cc
|
| +++ b/testing/gmock/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 {
|
|
|