Sorting out iterator type

This commit is contained in:
Matt Larsen 2016-03-03 15:30:28 -05:00
parent 9a9f3a1d22
commit f0c20903b3

@ -316,8 +316,8 @@ public:
VTKM_EXEC_EXPORT VTKM_EXEC_EXPORT
T Add(vtkm::Id index, const T& value) const T Add(vtkm::Id index, const T& value) const
{ {
T* lockedValue; IteratorType::pointer temp = &(*(Iterators.GetBegin()+index));
lockedValue = (Iterators.GetBegin()+index); T* lockedValue = temp;
return vtkmAtomicAdd(lockedValue, value); return vtkmAtomicAdd(lockedValue, value);
} }
@ -325,7 +325,7 @@ private:
typedef typename vtkm::cont::ArrayHandle<T,vtkm::cont::StorageTagBasic> typedef typename vtkm::cont::ArrayHandle<T,vtkm::cont::StorageTagBasic>
::template ExecutionTypes<DeviceAdapterTagTBB>::Portal PortalType; ::template ExecutionTypes<DeviceAdapterTagTBB>::Portal PortalType;
typedef vtkm::cont::ArrayPortalToIterators<PortalType> IteratorsType; typedef vtkm::cont::ArrayPortalToIterators<PortalType> IteratorsType;
typedef vtkm::cont::ArrayPortalToIterators<PortalType>::IteratorType IteratorType;
IteratorsType Iterators; IteratorsType Iterators;
VTKM_EXEC_EXPORT VTKM_EXEC_EXPORT