From 2d684efe87cafde18d8ce096887db48c83abb73c Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 6 May 2024 09:48:05 -0700 Subject: Use std::forward on GoogleTest matcher arguments This prevents a diagnostic from triggering for a missing std::move. PiperOrigin-RevId: 631094640 Change-Id: I4ab33964c65f41240fb54a6bf7d0261836fd78e7 --- googlemock/include/gmock/gmock-matchers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'googlemock') diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 33a6716..063ee6c 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -5606,8 +5606,8 @@ PolymorphicMatcher> ThrowsMessage( #define GMOCK_INTERNAL_MATCHER_ARGS_USAGE(args) \ GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_ARG_USAGE, , args)) -#define GMOCK_INTERNAL_MATCHER_ARG_USAGE(i, data_unused, arg_unused) \ - , gmock_p##i +#define GMOCK_INTERNAL_MATCHER_ARG_USAGE(i, data_unused, arg) \ + , ::std::forward(gmock_p##i) // To prevent ADL on certain functions we put them on a separate namespace. using namespace no_adl; // NOLINT -- cgit v1.1