Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-08 11:29:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'fix-vec-warnings'

Browse Source 
d4f94d4e1 Fix Vec <T, sizeof...(Ts)> warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1269
This commit is contained in:
Sujin Philip 2018-06-19 13:23:14 +00:00 committed by Kitware Robot
commit 0544ee6b71
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtkm/Types.h
View File

@ -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. /// same type or compile issues will occur.
/// ///
template <typename T, typename... Ts> 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. /// \brief A Vec-like representation for short arrays.

2
vtkm/cont/ArrayHandleSwizzle.h
View File

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