Update gmock and gtest.

testing/gmock/test/gmock-cardinalities_test.cc

 // Copyright 2007, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 34 matching lines @@
 using testing::AtMost;
 using testing::Between;
 using testing::Cardinality;
 using testing::CardinalityInterface;
 using testing::Exactly;
 using testing::IsSubstring;
 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.
 TEST(CardinalityTest, IsDefaultConstructable) {
   Cardinality c;
 }
 
 // Tests that Cardinality objects are copyable.
 TEST(CardinalityTest, IsCopyable) {
   // Tests the copy constructor.
@@ skipping 325 matching lines @@
 // CardinalityInterface and calling MakeCardinality().
 
 class EvenCardinality : public CardinalityInterface {
  public:
   // Returns true iff call_count calls will satisfy this cardinality.
   virtual bool IsSatisfiedByCallCount(int call_count) const {
     return (call_count % 2 == 0);
   }
 
   // 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 {
     *ss << "called even number of times";
   }
 };
 
 TEST(MakeCardinalityTest, ConstructsCardinalityFromInterface) {
   const Cardinality c = MakeCardinality(new EvenCardinality);
 
   EXPECT_TRUE(c.IsSatisfiedByCallCount(2));
   EXPECT_FALSE(c.IsSatisfiedByCallCount(3));
 
   EXPECT_FALSE(c.IsSaturatedByCallCount(10000));
 
   stringstream ss;
   c.DescribeTo(&ss);
   EXPECT_EQ("called even number of times", ss.str());
 }
 
 }  // Unnamed namespace