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-cardinalities.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-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) { |