Merge topic 'fix-vec-warnings'

d4f94d4e Fix Vec <T, sizeof...(Ts)> warnings
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1269

vtkm/Types.h

@@ -1008,9 +1008,10 @@ VTKM_EXEC_CONT vtkm::Vec<T, Size> make_Vec(std::initializer_list<T> values)
 /// same type or compile issues will occur.
 ///
 template <typename T, typename... Ts>
-VTKM_EXEC_CONT vtkm::Vec<T, sizeof...(Ts) + 1> make_Vec(const T& value0, const Ts&... values)
+VTKM_EXEC_CONT vtkm::Vec<T, vtkm::IdComponent(sizeof...(Ts) + 1)> make_Vec(const T& value0,
+                                                                           const Ts&... values)
 {
-  return vtkm::Vec<T, sizeof...(Ts) + 1>({ value0, values... });
+  return vtkm::Vec<T, vtkm::IdComponent(sizeof...(Ts) + 1)>({ value0, values... });
 }
 
 /// \brief A Vec-like representation for short arrays.

vtkm/cont/ArrayHandleSwizzle.h

@@ -388,7 +388,7 @@ VTKM_CONT ArrayHandleSwizzle<ArrayHandleType, OutSize> make_ArrayHandleSwizzle(
 }
 
 template <typename ArrayHandleType, typename... SwizzleIndexTypes>
-VTKM_CONT ArrayHandleSwizzle<ArrayHandleType, sizeof...(SwizzleIndexTypes) + 1>
+VTKM_CONT ArrayHandleSwizzle<ArrayHandleType, vtkm::IdComponent(sizeof...(SwizzleIndexTypes) + 1)>
 make_ArrayHandleSwizzle(const ArrayHandleType& array,
                         vtkm::IdComponent swizzleIndex0,
                         SwizzleIndexTypes... swizzleIndices)