From 2147806d2d5c0e88f6a8cbecc722f4f15bde9783 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 13 Feb 2019 09:45:53 -0800 Subject: Fix clang `-Winconsistent-missing-override` warnings `DescribeTo(..)` and `MatchAndExplain(..)` in `gmock-matchers_test` both override virtual methods. Remove the `virtual` keyword and apply `override` to them instead. Signed-off-by: Enji Cooper --- googlemock/test/gmock-matchers_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'googlemock') diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index cdca2300..b586d276 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -6943,10 +6943,10 @@ TEST(ArgsTest, ExplainsMatchResultWithoutInnerExplanation) { // For testing Args<>'s explanation. class LessThanMatcher : public MatcherInterface > { public: - virtual void DescribeTo(::std::ostream* os) const {} + void DescribeTo(::std::ostream* os) const override {} - virtual bool MatchAndExplain(std::tuple value, - MatchResultListener* listener) const { + bool MatchAndExplain(std::tuple value, + MatchResultListener* listener) const override { const int diff = std::get<0>(value) - std::get<1>(value); if (diff > 0) { *listener << "where the first value is " << diff -- cgit v1.2.3