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-cardinalities.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-cardinalities.cc')
| -rw-r--r-- | googlemock/src/gmock-cardinalities.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/src/gmock-cardinalities.cc b/googlemock/src/gmock-cardinalities.cc index 50ec7286..335b966e 100644 --- a/googlemock/src/gmock-cardinalities.cc +++ b/googlemock/src/gmock-cardinalities.cc @@ -92,7 +92,7 @@ class BetweenCardinalityImpl : public CardinalityInterface { }; // Formats "n times" in a human-friendly way. -inline internal::string FormatTimes(int n) { +inline std::string FormatTimes(int n) { if (n == 1) { return "once"; } else if (n == 2) { |