Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'dispatcher_base_proper_type_for_sizeof'

Browse Source 
d51ddda9 Since sizeof returns std::size_t we should iterate using unsigned integers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1016
This commit is contained in:
Robert Maynard 2017-12-07 13:12:06 +00:00 committed by Kitware Robot
commit 5ca31f7072
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vtkm/worklet/internal/DispatcherBase.h
View File

@ -212,10 +212,10 @@ private:
}; };
//forward declares //forward declares
template <int LeftToProcess> template <std::size_t LeftToProcess>
struct for_each_dynamic_arg; struct for_each_dynamic_arg;
template <int LeftToProcess, typename TypeCheckTag> template <std::size_t LeftToProcess, typename TypeCheckTag>
struct convert_arg_wrapper struct convert_arg_wrapper
{ {
template <typename T, typename... Args> template <typename T, typename... Args>
@ -238,7 +238,11 @@ struct convert_arg_wrapper
} }
}; };
template <int LeftToProcess, typename T, typename ContParams, typename Trampoline, typename... Args> template <std::size_t LeftToProcess,
typename T,
typename ContParams,
typename Trampoline,
typename... Args>
inline void convert_arg(vtkm::cont::internal::DynamicTransformTagStatic, inline void convert_arg(vtkm::cont::internal::DynamicTransformTagStatic,
T&& t, T&& t,
const ContParams&, const ContParams&,
@ -250,7 +254,11 @@ inline void convert_arg(vtkm::cont::internal::DynamicTransformTagStatic,
trampoline, popped_sig(), std::forward<Args>(args)..., std::forward<T>(t)); trampoline, popped_sig(), std::forward<Args>(args)..., std::forward<T>(t));
} }
template <int LeftToProcess, typename T, typename ContParams, typename Trampoline, typename... Args> template <std::size_t LeftToProcess,
typename T,
typename ContParams,
typename Trampoline,
typename... Args>
inline void convert_arg(vtkm::cont::internal::DynamicTransformTagCastAndCall, inline void convert_arg(vtkm::cont::internal::DynamicTransformTagCastAndCall,
T&& t, T&& t,
const ContParams&, const ContParams&,
@ -267,7 +275,7 @@ inline void convert_arg(vtkm::cont::internal::DynamicTransformTagCastAndCall,
std::forward<Args>(args)...); std::forward<Args>(args)...);
} }
template <int LeftToProcess> template <std::size_t LeftToProcess>
struct for_each_dynamic_arg struct for_each_dynamic_arg
{ {
template <typename Trampoline, typename ContParams, typename T, typename... Args> template <typename Trampoline, typename ContParams, typename T, typename... Args>