diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-13 15:00:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 15:00:07 -0500 |
| commit | 823f139bc7dba626545e5991ff3c49fad2dbd273 (patch) | |
| tree | ee0fe403f6c73e2be6247a178f929121f812b3c3 /googlemock/include | |
| parent | b3a1759eac70b26dc6f16562745c59030c6b927f (diff) | |
| parent | 38611c51215257df7cb533fdf983efbb95483afa (diff) | |
| download | googletest-823f139bc7dba626545e5991ff3c49fad2dbd273.tar.gz googletest-823f139bc7dba626545e5991ff3c49fad2dbd273.tar.bz2 googletest-823f139bc7dba626545e5991ff3c49fad2dbd273.zip | |
Merge branch 'master' into fix-printers
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 94c23d38..fc3fe3aa 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -3614,10 +3614,6 @@ 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 |