From 8f3854e2047e89d0f12df0a9b00fc18fcaea8713 Mon Sep 17 00:00:00 2001 From: dmauro Date: Wed, 27 May 2020 09:54:37 -0400 Subject: [PATCH] Googletest export Rollback of warning on unused ACTION result change PiperOrigin-RevId: 313380971 --- googlemock/include/gmock/gmock-actions.h | 1 - googlemock/include/gmock/gmock-generated-actions.h | 8 +------- googlemock/include/gmock/gmock-generated-actions.h.pump | 8 +------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h index e87296eb..ecf47c40 100644 --- a/googlemock/include/gmock/gmock-actions.h +++ b/googlemock/include/gmock/gmock-actions.h @@ -1512,7 +1512,6 @@ auto InvokeArgumentAdl(AdlTag, F f, Args... args) -> decltype(f(args...)) { return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const; \ }; \ }; \ - inline name##Action name() GTEST_MUST_USE_RESULT_; \ inline name##Action name() { return name##Action(); } \ template \ template \ diff --git a/googlemock/include/gmock/gmock-generated-actions.h b/googlemock/include/gmock/gmock-generated-actions.h index 4c1584ba..7030a98e 100644 --- a/googlemock/include/gmock/gmock-generated-actions.h +++ b/googlemock/include/gmock/gmock-generated-actions.h @@ -442,13 +442,7 @@ }\ GMOCK_INTERNAL_DEFN_##value_params\ };\ - template \ - GMOCK_ACTION_CLASS_(name, value_params)<\ - GMOCK_INTERNAL_LIST_##template_params\ - GMOCK_INTERNAL_LIST_TYPE_##value_params> name(\ - GMOCK_INTERNAL_DECL_##value_params) GTEST_MUST_USE_RESULT_;\ - template \ inline GMOCK_ACTION_CLASS_(name, value_params)<\ GMOCK_INTERNAL_LIST_##template_params\ diff --git a/googlemock/include/gmock/gmock-generated-actions.h.pump b/googlemock/include/gmock/gmock-generated-actions.h.pump index a6c5961b..3430204f 100644 --- a/googlemock/include/gmock/gmock-generated-actions.h.pump +++ b/googlemock/include/gmock/gmock-generated-actions.h.pump @@ -260,13 +260,7 @@ $range k 0..n-1 }\ GMOCK_INTERNAL_DEFN_##value_params\ };\ - template \ - GMOCK_ACTION_CLASS_(name, value_params)<\ - GMOCK_INTERNAL_LIST_##template_params\ - GMOCK_INTERNAL_LIST_TYPE_##value_params> name(\ - GMOCK_INTERNAL_DECL_##value_params) GTEST_MUST_USE_RESULT_;\ - template \ inline GMOCK_ACTION_CLASS_(name, value_params)<\ GMOCK_INTERNAL_LIST_##template_params\