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

PiperOrigin-RevId: 234844287
This commit is contained in:
Gennadiy Civil 2019-02-20 15:22:35 -05:00
commit c5a792d1b6
2 changed files with 2 additions and 2 deletions

View File

@ -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(

View File

@ -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 {