diff options
| author | gpetit <gaspard.petit@eidosmontreal.com> | 2017-08-14 13:45:45 -0400 |
|---|---|---|
| committer | gpetit <gaspard.petit@eidosmontreal.com> | 2017-08-14 13:45:45 -0400 |
| commit | 0c3c811164535eb5e539d83befba9caba48a9dfd (patch) | |
| tree | 0bc15116e1259078b02e6608bc10d838711759b5 /googlemock/src/gmock-cardinalities.cc | |
| parent | 8f04622cc1507a3954490a03a1dfcff9e340359e (diff) | |
| parent | 673c975a963f356b19fea90cb57b69192253da2a (diff) | |
| download | googletest-0c3c811164535eb5e539d83befba9caba48a9dfd.tar.gz googletest-0c3c811164535eb5e539d83befba9caba48a9dfd.tar.bz2 googletest-0c3c811164535eb5e539d83befba9caba48a9dfd.zip | |
Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf
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) { |