aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/gmock-matchers.h
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-02-12 16:57:08 -0500
committerGitHub <noreply@github.com>2018-02-12 16:57:08 -0500
commit9d1a80c0fbc03d8c824e0263d27d419b38b61bf4 (patch)
treef34e07e2970e08d06e5efcc993198ad844c19c19 /googlemock/include/gmock/gmock-matchers.h
parent222607a019638b104f67b5bd6cf7572a091500b2 (diff)
parent1a7732a488850da770943e78ccd6de42985564a1 (diff)
downloadgoogletest-9d1a80c0fbc03d8c824e0263d27d419b38b61bf4.tar.gz
googletest-9d1a80c0fbc03d8c824e0263d27d419b38b61bf4.tar.bz2
googletest-9d1a80c0fbc03d8c824e0263d27d419b38b61bf4.zip
Merge pull request #1452 from gennadiycivil/master
moving JoinAsTuple to internal
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
-rw-r--r--googlemock/include/gmock/gmock-matchers.h4
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