diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-21 13:11:58 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-21 13:11:58 -0400 |
commit | 96f7ba83cb225dd9152dcffe3104af093e66510a (patch) | |
tree | 0cf8937f69d91039df408576db9352d4f2c377d8 /googlemock/src/gmock-matchers.cc | |
parent | b74070cfd90c57b3ef2f80c8a50ca5f505a9e3aa (diff) | |
parent | 675686a139a731a2c796633e67e9421792363709 (diff) | |
download | googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.tar.gz googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.tar.bz2 googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.zip |
Merge branch 'master' into wrong-version-reported
Diffstat (limited to 'googlemock/src/gmock-matchers.cc')
-rw-r--r-- | googlemock/src/gmock-matchers.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/googlemock/src/gmock-matchers.cc b/googlemock/src/gmock-matchers.cc index e7424510..6e40e5e8 100644 --- a/googlemock/src/gmock-matchers.cc +++ b/googlemock/src/gmock-matchers.cc @@ -288,7 +288,7 @@ class MaxBipartiteMatchState { // Each element of the left_ vector represents a left hand side node // (i.e. an element) and each element of right_ is a right hand side // node (i.e. a matcher). The values in the left_ vector indicate - // outflow from that node to a node on the the right_ side. The values + // outflow from that node to a node on the right_ side. The values // in the right_ indicate inflow, and specify which left_ node is // feeding that right_ node, if any. For example, left_[3] == 1 means // there's a flow from element #3 to matcher #1. Such a flow would also @@ -379,7 +379,7 @@ void MatchMatrix::Randomize() { } } -string MatchMatrix::DebugString() const { +std::string MatchMatrix::DebugString() const { ::std::stringstream ss; const char *sep = ""; for (size_t i = 0; i < LhsSize(); ++i) { @@ -441,10 +441,9 @@ void UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl( // Returns false, writing an explanation to 'listener', if and only // if the success criteria are not met. bool UnorderedElementsAreMatcherImplBase:: -VerifyAllElementsAndMatchersAreMatched( - const ::std::vector<string>& element_printouts, - const MatchMatrix& matrix, - MatchResultListener* listener) const { + VerifyAllElementsAndMatchersAreMatched( + const ::std::vector<std::string>& element_printouts, + const MatchMatrix& matrix, MatchResultListener* listener) const { bool result = true; ::std::vector<char> element_matched(matrix.LhsSize(), 0); ::std::vector<char> matcher_matched(matrix.RhsSize(), 0); |