Merge topic 'backport-cgohlke-master-patch-04055' into release-1.8
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:
commit
6c503b6468
@ -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));
|
||||
|
||||
|
@ -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));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user