diff options
| author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-01-12 16:00:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 16:00:39 +0000 |
| commit | 27bb844e5c31a0a67b7b4864ffb2b80ae2803882 (patch) | |
| tree | e8cca8f555358fa2ed590a226c8a15a0354dbd80 /googlemock/include | |
| parent | 8f90d46c8cdd743759821a1c987a70e826d58cef (diff) | |
| parent | ed8d02cfc689f26b65e6deb585561c59615b05de (diff) | |
| download | googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.gz googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.bz2 googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.zip | |
Merge branch 'master' into fix-argc
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 |