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

FindFirstSetBit now correctly compiles with the Intel compiler

Browse Source 
Fixes https://gitlab.kitware.com/paraview/paraview/issues/18993
This commit is contained in:
Robert Maynard 2019-05-08 15:48:58 -04:00
parent 850aa44be4
commit fa3722bfa3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/Math.h
View File

@ -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;

4
vtkm/Math.h.in
View File

@ -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;