diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-05 15:34:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 15:34:07 -0500 |
| commit | fab06101d709fe5e89cb2bd1f5c8a93085cecd6f (patch) | |
| tree | 859c913292e0026a50f1ba85f9a748d1468d2e4a /googlemock/include | |
| parent | 67476c1426dc520f1ff0eb16e6c00d050d489721 (diff) | |
| parent | 5b26b0fce73eda28890d1c9baff4eb4e5aa7d9d2 (diff) | |
| download | googletest-fab06101d709fe5e89cb2bd1f5c8a93085cecd6f.tar.gz googletest-fab06101d709fe5e89cb2bd1f5c8a93085cecd6f.tar.bz2 googletest-fab06101d709fe5e89cb2bd1f5c8a93085cecd6f.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index c446bf7d..3367a0b5 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -3615,6 +3615,10 @@ BoundSecondMatcher<Tuple2Matcher, Second> MatcherBindSecond( return BoundSecondMatcher<Tuple2Matcher, Second>(tm, second); } +// Joins a vector of strings as if they are fields of a tuple; returns +// the joined string. This function is exported for testing. +GTEST_API_ string JoinAsTuple(const Strings& fields); + // 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 |