Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'backport-cgohlke-master-patch-04055' into release-1.9

Browse Source 
70728978d Fix unresolved external symbol __popcnt on win-arm64
df5b5bf32 Fix unresolved external symbol __popcnt on win-arm64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2932
This commit is contained in:
Vicente Bolea 2022-11-29 16:37:46 +00:00 committed by Kitware Robot
commit fcfeef0f42
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

@ -2890,7 +2890,7 @@ vtkm::Int32 CountSetBits(vtkm::UInt32 word)
return __builtin_popcount(word);
# elif defined(VTKM_MSVC)
# elif defined(VTKM_MSVC) && !defined(_M_ARM64)
return static_cast<vtkm::Int32>(__popcnt(word));
@ -2932,7 +2932,7 @@ vtkm::Int32 CountSetBits(vtkm::UInt64 word)
return __builtin_popcountll(word);
# elif defined(VTKM_MSVC)
# elif defined(VTKM_MSVC) && !defined(_M_ARM64)
return static_cast<vtkm::Int32>(__popcnt64(word));

4
vtkm/Math.h.in
View File

@ -1492,7 +1492,7 @@ vtkm::Int32 CountSetBits(vtkm::UInt32 word)
return __builtin_popcount(word);
# elif defined(VTKM_MSVC)
# elif defined(VTKM_MSVC) && !defined(_M_ARM64)
return static_cast<vtkm::Int32>(__popcnt(word));
@ -1534,7 +1534,7 @@ vtkm::Int32 CountSetBits(vtkm::UInt64 word)
return __builtin_popcountll(word);
# elif defined(VTKM_MSVC)
# elif defined(VTKM_MSVC) && !defined(_M_ARM64)
return static_cast<vtkm::Int32>(__popcnt64(word));