diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-02-20 15:22:27 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-02-20 15:22:28 -0500 |
| commit | c374893023c9dcf637a370a265cacbf5ac7728ac (patch) | |
| tree | 802c54cebf36fb54f658204c00ea604f26e3f7d2 | |
| parent | 873e479817d3e676416f761edb6be45dd601637f (diff) | |
| parent | 2147806d2d5c0e88f6a8cbecc722f4f15bde9783 (diff) | |
| download | googletest-c374893023c9dcf637a370a265cacbf5ac7728ac.tar.gz googletest-c374893023c9dcf637a370a265cacbf5ac7728ac.tar.bz2 googletest-c374893023c9dcf637a370a265cacbf5ac7728ac.zip | |
Merge pull request #2123 from ngie-eign:clang-inconsistent-missing-override
PiperOrigin-RevId: 234840107
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 6 | ||||
| -rw-r--r-- | googletest/docs/primer.md | 2 |
2 files changed, 4 insertions, 4 deletions
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<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 diff --git a/googletest/docs/primer.md b/googletest/docs/primer.md index 1d995574..6344ba33 100644 --- a/googletest/docs/primer.md +++ b/googletest/docs/primer.md @@ -122,7 +122,7 @@ To provide a custom failure message, simply stream it into the macro using the ```c++ ASSERT_EQ(x.size(), y.size()) << "Vectors x and y are of unequal length"; -for (int i = 0; i < std::min(x.size(), y.size()); ++i) { +for (int i = 0; i < x.size(); ++i) { EXPECT_EQ(x[i], y[i]) << "Vectors x and y differ at index " << i; } ``` |