diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2017-05-16 17:00:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-16 17:00:03 -0400 |
| commit | 7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9 (patch) | |
| tree | 8f92a22eb8633766fc7d2e689593bd100dc17824 /googlemock/src/gmock-matchers.cc | |
| parent | 078d5d930ad8b25b3c61556dc6de7ad13fa9a179 (diff) | |
| parent | 09fd5b3ebfaac10b78bda664ec7f57fac74ef214 (diff) | |
| download | googletest-7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9.tar.gz googletest-7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9.tar.bz2 googletest-7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9.zip | |
Merge pull request #1089 from nico/stdstring
Use std::string and ::string explicitly in gtest and gmock code.
Diffstat (limited to 'googlemock/src/gmock-matchers.cc')
| -rw-r--r-- | googlemock/src/gmock-matchers.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/googlemock/src/gmock-matchers.cc b/googlemock/src/gmock-matchers.cc index e7424510..e0de25cb 100644 --- a/googlemock/src/gmock-matchers.cc +++ b/googlemock/src/gmock-matchers.cc @@ -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); |