diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-27 10:00:29 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-27 10:00:29 -0500 |
commit | d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199 (patch) | |
tree | fd25c57276fa42ec365f1ca05b4853ab459697e4 /googlemock/src/gmock-matchers.cc | |
parent | 3498a1ac52deb83f30b8170c78bfba9dc6227198 (diff) | |
parent | ac34e6c950925df7165e626becd3f9d64dcd584b (diff) | |
download | googletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.tar.gz googletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.tar.bz2 googletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.zip |
Merge branch 'master' into win-libcxx2
Diffstat (limited to 'googlemock/src/gmock-matchers.cc')
-rw-r--r-- | googlemock/src/gmock-matchers.cc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/googlemock/src/gmock-matchers.cc b/googlemock/src/gmock-matchers.cc index 6e40e5e8..f37d5c2d 100644 --- a/googlemock/src/gmock-matchers.cc +++ b/googlemock/src/gmock-matchers.cc @@ -100,25 +100,6 @@ Matcher<StringPiece>::Matcher(StringPiece s) { namespace internal { -// Joins a vector of strings as if they are fields of a tuple; returns -// the joined string. -GTEST_API_ string JoinAsTuple(const Strings& fields) { - switch (fields.size()) { - case 0: - return ""; - case 1: - return fields[0]; - default: - string result = "(" + fields[0]; - for (size_t i = 1; i < fields.size(); i++) { - result += ", "; - result += fields[i]; - } - result += ")"; - return result; - } -} - // Returns the description for a matcher defined using the MATCHER*() // macro where the user-supplied description string is "", if // 'negation' is false; otherwise returns the description of the |