From 5df9088e1dfc76efa50b63ae0a5062de355a33f6 Mon Sep 17 00:00:00 2001 From: Matt Larsen Date: Thu, 3 Mar 2016 23:13:26 -0500 Subject: [PATCH] Adding volatile --- vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h b/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h index 9f2af5dda..59c3c0ea7 100644 --- a/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h +++ b/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h @@ -338,7 +338,7 @@ private: { #if defined(VTKM_MSVC) long msValue = value; - long * msPtr = (long *) address; + volatile long * msPtr = (volatile long *) address; return InterlockedExchangeAdd(msPtr,msValue); #else return __sync_fetch_and_add(address,value); @@ -350,7 +350,7 @@ private: { #if defined(VTKM_MSVC) long long msValue = value; - long long * msPtr = (long long *) address; + volatile long long * msPtr = (volatile long long *) address; return InterlockedExchangeAdd64(msPtr,msValue); #else return __sync_fetch_and_add(address,value); @@ -362,7 +362,7 @@ private: { #if defined(VTKM_MSVC) unsigned long msValue = value; - unsigned long * msPtr = (unsigned long *) address; + volatile unsigned long * msPtr = (volatile unsigned long *) address; return InterlockedExchangeAdd(msPtr,msValue); #else return __sync_fetch_and_add(address,value); @@ -374,7 +374,7 @@ private: { #if defined(VTKM_MSVC) unsigned long long msValue = value; - unsigned long long * msPtr = (unsigned long long *) address; + volatile unsigned long long * msPtr = (volatile unsigned long long *) address; return InterlockedExchangeAdd64(msPtr,msValue); #else return __sync_fetch_and_add(address,value);