Commit 77f17450 authored by Allison Vacanti's avatar Allison Vacanti Committed by Kitware Robot

Merge topic 'nvcc_fixes'

bff75de4 Use std::is_integral<T>::value instead of is_int<>{}.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland's avatarKenneth Moreland <kmorel@sandia.gov>
Merge-request: !1736
parents 468ee61c bff75de4
......@@ -291,7 +291,7 @@ struct ReduceHelper
template <typename T, typename U>
struct IsIntegral<vtkm::Pair<T, U>>
: public std::integral_constant<bool, std::is_integral<T>{} && std::is_integral<U>{}>
: public std::integral_constant<bool, std::is_integral<T>::value && std::is_integral<U>::value>
{
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment