diff options
| author | dmauro <dmauro@google.com> | 2020-05-27 13:54:37 (GMT) |
|---|---|---|
| committer | Derek Mauro <dmauro@google.com> | 2020-05-28 23:54:56 (GMT) |
| commit | 8f3854e2047e89d0f12df0a9b00fc18fcaea8713 (patch) | |
| tree | 46133ddce0f16f75f7620714613102bb7c60703f /googlemock | |
| parent | 130ae78b990a2a2c6071c1221861d2e6b7f748e9 (diff) | |
| download | googletest-8f3854e2047e89d0f12df0a9b00fc18fcaea8713.zip googletest-8f3854e2047e89d0f12df0a9b00fc18fcaea8713.tar.gz googletest-8f3854e2047e89d0f12df0a9b00fc18fcaea8713.tar.bz2 | |
Googletest export
Rollback of warning on unused ACTION result change
PiperOrigin-RevId: 313380971
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/gmock-actions.h | 1 | ||||
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-actions.h | 8 | ||||
| -rw-r--r-- | 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 e87296e..ecf47c4 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 <typename F> \ template <GMOCK_ACTION_TEMPLATE_ARGS_NAMES_> \ diff --git a/googlemock/include/gmock/gmock-generated-actions.h b/googlemock/include/gmock/gmock-generated-actions.h index 4c1584b..7030a98 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_INTERNAL_DECL_##template_params \ - GMOCK_INTERNAL_DECL_TYPE_##value_params>\ - 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 <GMOCK_INTERNAL_DECL_##template_params \ + template <GMOCK_INTERNAL_DECL_##template_params\ GMOCK_INTERNAL_DECL_TYPE_##value_params>\ 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 a6c5961..3430204 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_INTERNAL_DECL_##template_params \ - GMOCK_INTERNAL_DECL_TYPE_##value_params>\ - 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 <GMOCK_INTERNAL_DECL_##template_params \ + template <GMOCK_INTERNAL_DECL_##template_params\ GMOCK_INTERNAL_DECL_TYPE_##value_params>\ inline GMOCK_ACTION_CLASS_(name, value_params)<\ GMOCK_INTERNAL_LIST_##template_params\ |