Skip to content

GitLab

Commit b155875f authored by Gennadiy Rozental's avatar Gennadiy Rozental
Browse files

Merge pull request #2583 from ChristophStrehle:master 

PiperOrigin-RevId: 282817206
parents 34e92be3 6a9d6d5c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
googlemock/include/gmock/gmock-actions.h
View file @ b155875f
...@@ -916,7 +916,8 @@ struct WithArgsAction { ...@@ -916,7 +916,8 @@ struct WithArgsAction {
// We use the conversion operator to detect the signature of the inner Action. // We use the conversion operator to detect the signature of the inner Action.
template <typename R, typename... Args> template <typename R, typename... Args>
operator Action<R(Args...)>() const { // NOLINT 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); converted(action);
return [converted](Args... args) -> R { return [converted](Args... args) -> R {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment