Merge pull request #2123 from ngie-eign:clang-inconsistent-missing-override

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

View File

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