summaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/internal
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2021-12-27 16:04:50 (GMT)
committerCopybara-Service <copybara-worker@google.com>2021-12-27 16:05:24 (GMT)
commit6b74da4757a549563d7c37c8fae3e704662a043b (patch)
tree2afd76fa446a1330be4579e39ff4c039cf1eaa30 /googlemock/include/gmock/internal
parentd81ae2f0bf2bb3fbb23691cae68e75a7563ae19d (diff)
downloadgoogletest-6b74da4757a549563d7c37c8fae3e704662a043b.zip
googletest-6b74da4757a549563d7c37c8fae3e704662a043b.tar.gz
googletest-6b74da4757a549563d7c37c8fae3e704662a043b.tar.bz2
Include the param names in the generated description of the MATCHER_P matchers.
PiperOrigin-RevId: 418497526 Change-Id: Ie53c3c0810c10a32cbcb941e3ca1ee8fb1ddd9f9
Diffstat (limited to 'googlemock/include/gmock/internal')
-rw-r--r--googlemock/include/gmock/internal/gmock-internal-utils.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h
index 2975fad..577f52f 100644
--- a/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/googlemock/include/gmock/internal/gmock-internal-utils.h
@@ -38,9 +38,12 @@
#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
#include <stdio.h>
+
#include <ostream> // NOLINT
#include <string>
#include <type_traits>
+#include <vector>
+
#include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h"
@@ -61,7 +64,8 @@ namespace internal {
// Joins a vector of strings as if they are fields of a tuple; returns
// the joined string.
-GTEST_API_ std::string JoinAsTuple(const Strings& fields);
+GTEST_API_ std::string JoinAsKeyValueTuple(
+ const std::vector<const char*>& names, const Strings& values);
// Converts an identifier name to a space-separated list of lower-case
// words. Each maximum substring of the form [A-Za-z][a-z]*|\d+ is