summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-02-20 20:22:35 (GMT)
committerGennadiy Civil <misterg@google.com>2019-02-20 20:22:35 (GMT)
commitc5a792d1b685f506fcfac24fde867856a6b94070 (patch)
tree87410a189ec0370883b955fb453742c343eb54b1 /googlemock
parentc374893023c9dcf637a370a265cacbf5ac7728ac (diff)
parent1c22797cd3046a9fb74dc49268ac18ab86c14568 (diff)
downloadgoogletest-c5a792d1b685f506fcfac24fde867856a6b94070.zip
googletest-c5a792d1b685f506fcfac24fde867856a6b94070.tar.gz
googletest-c5a792d1b685f506fcfac24fde867856a6b94070.tar.bz2
Merge pull request #2125 from ngie-eign:clang-unused-parameter
PiperOrigin-RevId: 234844287
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/test/gmock-generated-matchers_test.cc2
-rw-r--r--googlemock/test/gmock-matchers_test.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/test/gmock-generated-matchers_test.cc b/googlemock/test/gmock-generated-matchers_test.cc
index eb47f2b..6c4b300 100644
--- a/googlemock/test/gmock-generated-matchers_test.cc
+++ b/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(
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc
index b586d27..40ccaf0 100644
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/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 {