Merge pull request #2583 from ChristophStrehle:master

PiperOrigin-RevId: 282817206
google · Nov 27, 2019 · b155875 · b155875
2 parents 34e92be + 6a9d6d5
commit b155875
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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 {