From d4f94d4e14ab81981b148809f74d6b9a1871faf6 Mon Sep 17 00:00:00 2001
From: Sujin Philip <sujin.philip@kitware.com>
Date: Mon, 18 Jun 2018 14:44:35 -0400
Subject: [PATCH] Fix Vec <T, sizeof...(Ts)> warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Several "conversion to ‘int’ from ‘long unsigned int’" are produced in gcc.
---
 vtkm/Types.h                   | 5 +++--
 vtkm/cont/ArrayHandleSwizzle.h | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/vtkm/Types.h b/vtkm/Types.h
index 7a13a51fa..26ec849c0 100644
--- a/vtkm/Types.h
+++ b/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.
diff --git a/vtkm/cont/ArrayHandleSwizzle.h b/vtkm/cont/ArrayHandleSwizzle.h
index 3e09dd71a..8dd77d12b 100644
--- a/vtkm/cont/ArrayHandleSwizzle.h
+++ b/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)