Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

changing MS method signatures to long instead of int

Browse Source
This commit is contained in:
Matt Larsen 2016-03-04 11:13:53 -08:00
parent 47452d82bc
commit 733edc8325
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h
View File

@ -337,25 +337,25 @@ private:
#if defined(VTKM_MSVC) //MSVC atomics #if defined(VTKM_MSVC) //MSVC atomics
VTKM_EXEC_EXPORT VTKM_EXEC_EXPORT
vtkm::Int32 vtkmAtomicAdd(volatile vtkm::Int32 *address, const vtkm::Int32 &value) const vtkm::Int32 vtkmAtomicAdd(volatile long *address, const long &value) const
{ {
return InterlockedExchangeAdd(address,value); return InterlockedExchangeAdd(address,value);
} }
VTKM_EXEC_EXPORT VTKM_EXEC_EXPORT
vtkm::Int64 vtkmAtomicAdd(volatile vtkm::Int64 *address, const vtkm::Int64 &value) const vtkm::Int64 vtkmAtomicAdd(volatile long long *address, const long long &value) const
{ {
return InterlockedExchangeAdd64(address,value); return InterlockedExchangeAdd64(address,value);
} }
VTKM_EXEC_EXPORT VTKM_EXEC_EXPORT
vtkm::UInt32 vtkmAtomicAdd(volatile vtkm::UInt32 *address, const vtkm::UInt32 &value) const vtkm::UInt32 vtkmAtomicAdd(volatile unsigned long *address, const unsigned long &value) const
{ {
return InterlockedExchangeAdd(address,value); return InterlockedExchangeAdd(address,value);
} }
VTKM_EXEC_EXPORT VTKM_EXEC_EXPORT
vtkm::UInt64 vtkmAtomicAdd(volatile vtkm::UInt64 *address, const vtkm::UInt64 &value) const vtkm::UInt64 vtkmAtomicAdd(volatile unsigned long long *address, const unsigned long long &value) const
{ {
return InterlockedExchangeAdd64(address,value); return InterlockedExchangeAdd64(address,value);
} }