Merge pull request #2125 from ngie-eign:clang-unused-parameter

googlemock/test/gmock-generated-matchers_test.cc

@@ -1262,7 +1262,7 @@ namespace adl_test {
 MATCHER(M, "") { return true; }
 
 template <typename T1, typename T2>
-bool AllOf(const T1& t1, const T2& t2) { return true; }
+bool AllOf(const T1& /*t1*/, const T2& /*t2*/) { return true; }
 
 TEST(AllOfTest, DoesNotCallAllOfUnqualified) {
   EXPECT_THAT(42, testing::AllOf(

googlemock/test/gmock-matchers_test.cc

@@ -6943,7 +6943,7 @@ TEST(ArgsTest, ExplainsMatchResultWithoutInnerExplanation) {
 // For testing Args<>'s explanation.
 class LessThanMatcher : public MatcherInterface<std::tuple<char, int> > {
  public:
-  void DescribeTo(::std::ostream* os) const override {}
+  void DescribeTo(::std::ostream* /*os*/) const override {}
 
   bool MatchAndExplain(std::tuple<char, int> value,
                        MatchResultListener* listener) const override {