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

Fixing problem with function signatures matching long * to int *

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

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

@ -316,11 +316,11 @@ public:
VTKM_EXEC_EXPORT
T Add(vtkm::Id index, const T& value) const
{
T* lockedValue;
#if defined(VTKM_MSVC)
volatile T* lockedValue;
typedef typename vtkm::cont::ArrayPortalToIterators<PortalType>::IteratorType IteratorType;
typename IteratorType::pointer temp = &(*(Iterators.GetBegin()+index));
lockedValue = static_cast<volatile T*>(temp);
lockedValue = temp;
return vtkmAtomicAdd(lockedValue, value);
#else
T* lockedValue;
@ -337,27 +337,27 @@ private:
#if defined(VTKM_MSVC) //MSVC atomics
VTKM_EXEC_EXPORT
vtkm::Int32 vtkmAtomicAdd(volatile long *address, const long &value) const
vtkm::Int32 vtkmAtomicAdd(vtkm::Int32 *address, const vtkm::Int32 &value) const
{
return InterlockedExchangeAdd(address,value);
return InterlockedExchangeAdd(static_cast<volatile long *>(address),value);
}
VTKM_EXEC_EXPORT
vtkm::Int64 vtkmAtomicAdd(volatile long long *address, const long long &value) const
vtkm::Int64 vtkmAtomicAdd(vtkm::Int64 *address, const vtkm::Int64 &value) const
{
return InterlockedExchangeAdd64(address,value);
return InterlockedExchangeAdd64(static_cast<volatile long long *>(address),value);
}
VTKM_EXEC_EXPORT
vtkm::UInt32 vtkmAtomicAdd(volatile unsigned long *address, const unsigned long &value) const
vtkm::UInt32 vtkmAtomicAdd(vtkm::UInt32 *address, const vtkm::UInt32 &value) const
{
return InterlockedExchangeAdd(address,value);
return InterlockedExchangeAdd(static_cast<volatile unsigned long *>(address),value);
}
VTKM_EXEC_EXPORT
vtkm::UInt64 vtkmAtomicAdd(volatile unsigned long long *address, const unsigned long long &value) const
vtkm::UInt64 vtkmAtomicAdd(vtkm::UInt64 *address, const vtkm::UInt64 &value) const
{
return InterlockedExchangeAdd64(address,value);
return InterlockedExchangeAdd64(static_cast<volatile unsigned long long *>(address),value);
}
#else //gcc built-in atomics