Commit 1ce9c309 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'correct_intel_findfirstsetbit'

fa3722bf FindFirstSetBit now correctly compiles with the Intel compiler
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1668
parents 850aa44b fa3722bf
......@@ -2653,12 +2653,12 @@ vtkm::Int32 FindFirstSetBit(vtkm::UInt64 word)
inline VTKM_EXEC_CONT
vtkm::Int32 FindFirstSetBit(vtkm::UInt64 word)
{
# if defined(VTKM_GCC) || defined(VTKM_CLANG)
# if defined(VTKM_GCC) || defined(VTKM_CLANG) || defined(VTKM_ICC)
// Output is [0,64], with ffs(0) == 0
return __builtin_ffsll(static_cast<long long int>(word));
# elif defined(VTKM_MSVC) || defined(VTKM_ICC)
# elif defined(VTKM_MSVC)
// Output is [0, 63], check return code to see if bits are set:
vtkm::UInt32 firstSet;
......
......@@ -1255,12 +1255,12 @@ vtkm::Int32 FindFirstSetBit(vtkm::UInt64 word)
inline VTKM_EXEC_CONT
vtkm::Int32 FindFirstSetBit(vtkm::UInt64 word)
{
# if defined(VTKM_GCC) || defined(VTKM_CLANG)
# if defined(VTKM_GCC) || defined(VTKM_CLANG) || defined(VTKM_ICC)
// Output is [0,64], with ffs(0) == 0
return __builtin_ffsll(static_cast<long long int>(word));
# elif defined(VTKM_MSVC) || defined(VTKM_ICC)
# elif defined(VTKM_MSVC)
// Output is [0, 63], check return code to see if bits are set:
vtkm::UInt32 firstSet;
......
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