summaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2017-02-11 00:19:54 (GMT)
committerDavid Benjamin <davidben@google.com>2018-01-03 19:50:22 (GMT)
commitb3d9be5c1d969dfdbf1f1ff924b9fd1be5eaecc9 (patch)
tree3ffa0c2921d9f401e92ada32cc5f6d1f9f3258b9 /googlemock/include/gmock
parentba6ecedede74521490f36b6aea08f91fdad6d201 (diff)
downloadgoogletest-b3d9be5c1d969dfdbf1f1ff924b9fd1be5eaecc9.zip
googletest-b3d9be5c1d969dfdbf1f1ff924b9fd1be5eaecc9.tar.gz
googletest-b3d9be5c1d969dfdbf1f1ff924b9fd1be5eaecc9.tar.bz2
Pass the -Wmissing-declarations warning.
This makes it easier to use GTest in projects that build with the -Wmissing-declarations warning. This fixes the warning in headers and source files, though not GTest's own tests as it is rather noisy there.
Diffstat (limited to 'googlemock/include/gmock')
-rw-r--r--googlemock/include/gmock/gmock-matchers.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h
index c446bf7..3367a0b 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