diff options
| author | Gennadiy Rozental <rogeeff@google.com> | 2019-11-27 16:20:38 -0500 |
|---|---|---|
| committer | Gennadiy Rozental <rogeeff@google.com> | 2019-11-27 16:20:38 -0500 |
| commit | b155875f32dc74e293d96c0de2dfcdfa913804e4 (patch) | |
| tree | e9e0cb1391d05ae58b889454293407e1ee6f0cb2 /googlemock/include | |
| parent | 34e92be31cf457ad4054b7908ee5e0e214dbcddc (diff) | |
| parent | 6a9d6d5c28a78bb0f1906d3a6bea5c04f584c24a (diff) | |
| download | googletest-b155875f32dc74e293d96c0de2dfcdfa913804e4.tar.gz googletest-b155875f32dc74e293d96c0de2dfcdfa913804e4.tar.bz2 googletest-b155875f32dc74e293d96c0de2dfcdfa913804e4.zip | |
Merge pull request #2583 from ChristophStrehle:master
PiperOrigin-RevId: 282817206
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-actions.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h index dcdbab5a..c08d97b9 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 { |