eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
PiperOrigin-RevId: 234840107
This commit is contained in:
Gennadiy Civil 2019-02-20 15:22:27 -05:00
commit c374893023
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
googlemock/test/gmock-matchers_test.cc
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

2
googletest/docs/primer.md
View File

@ -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;
}
```