summaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/gmock-actions.h
diff options
context:
space:
mode:
authorGennadiy Rozental <rogeeff@google.com>2019-11-27 21:20:38 (GMT)
committerGennadiy Rozental <rogeeff@google.com>2019-11-27 21:20:38 (GMT)
commitb155875f32dc74e293d96c0de2dfcdfa913804e4 (patch)
treee9e0cb1391d05ae58b889454293407e1ee6f0cb2 /googlemock/include/gmock/gmock-actions.h
parent34e92be31cf457ad4054b7908ee5e0e214dbcddc (diff)
parent6a9d6d5c28a78bb0f1906d3a6bea5c04f584c24a (diff)
downloadgoogletest-b155875f32dc74e293d96c0de2dfcdfa913804e4.zip
googletest-b155875f32dc74e293d96c0de2dfcdfa913804e4.tar.gz
googletest-b155875f32dc74e293d96c0de2dfcdfa913804e4.tar.bz2
Merge pull request #2583 from ChristophStrehle:master
PiperOrigin-RevId: 282817206
Diffstat (limited to 'googlemock/include/gmock/gmock-actions.h')
-rw-r--r--googlemock/include/gmock/gmock-actions.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h
index dcdbab5..c08d97b 100644
--- a/googlemock/include/gmock/gmock-actions.h
+++ b/googlemock/include/gmock/gmock-actions.h
@@ -916,7 +916,8 @@ struct WithArgsAction {
// We use the conversion operator to detect the signature of the inner Action.
template <typename R, typename... Args>
operator Action<R(Args...)>() const { // NOLINT
- Action<R(typename std::tuple_element<I, std::tuple<Args...>>::type...)>
+ using TupleType = std::tuple<Args...>;
+ Action<R(typename std::tuple_element<I, TupleType>::type...)>
converted(action);
return [converted](Args... args) -> R {