Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 11:05:44 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'msvc-issues' into 'master'

Browse Source 
MSVC issues

Fixes on fixes to MSVC warnings.

See merge request !108
This commit is contained in:
Kenneth Moreland 2015-07-29 23:11:06 -04:00
commit f25c45b10b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,7 @@ private:
//use temp, and iterators instead of member variable to reduce false sharing //use temp, and iterators instead of member variable to reduce false sharing
typename InputIteratorsType::IteratorType inIter = typename InputIteratorsType::IteratorType inIter =
inputIterators.GetBegin() + static_cast<std::size_t>(range.begin()); inputIterators.GetBegin() + static_cast<std::ptrdiff_t>(range.begin());
ValueType temp = this->FirstCall ? *inIter++ : ValueType temp = this->FirstCall ? *inIter++ :
this->BinaryOperation(this->Sum, *inIter++); this->BinaryOperation(this->Sum, *inIter++);
this->FirstCall = false; this->FirstCall = false;
@ -150,9 +150,9 @@ private:
//use temp, and iterators instead of member variable to reduce false sharing //use temp, and iterators instead of member variable to reduce false sharing
typename InputIteratorsType::IteratorType inIter = typename InputIteratorsType::IteratorType inIter =
inputIterators.GetBegin() + static_cast<std::size_t>(range.begin()); inputIterators.GetBegin() + static_cast<std::ptrdiff_t>(range.begin());
typename OutputIteratorsType::IteratorType outIter = typename OutputIteratorsType::IteratorType outIter =
outputIterators.GetBegin() + static_cast<std::size_t>(range.begin()); outputIterators.GetBegin() + static_cast<std::ptrdiff_t>(range.begin());
ValueType temp = this->FirstCall ? *inIter++ : ValueType temp = this->FirstCall ? *inIter++ :
this->BinaryOperation(this->Sum, *inIter++); this->BinaryOperation(this->Sum, *inIter++);
this->FirstCall = false; this->FirstCall = false;
@ -244,7 +244,7 @@ private:
//move the iterator to the first item //move the iterator to the first item
typename InputIteratorsType::IteratorType iter = typename InputIteratorsType::IteratorType iter =
inputIterators.GetBegin() + static_cast<std::size_t>(range.begin()); inputIterators.GetBegin() + static_cast<std::ptrdiff_t>(range.begin());
ValueType temp = this->Sum; ValueType temp = this->Sum;
for (vtkm::Id index = range.begin(); index != range.end(); ++index, ++iter) for (vtkm::Id index = range.begin(); index != range.end(); ++index, ++iter)
{ {
@ -266,9 +266,9 @@ private:
//move the iterators to the first item //move the iterators to the first item
typename InputIteratorsType::IteratorType inIter = typename InputIteratorsType::IteratorType inIter =
inputIterators.GetBegin() + static_cast<std::size_t>(range.begin()); inputIterators.GetBegin() + static_cast<std::ptrdiff_t>(range.begin());
typename OutputIteratorsType::IteratorType outIter = typename OutputIteratorsType::IteratorType outIter =
outputIterators.GetBegin() + static_cast<std::size_t>(range.begin()); outputIterators.GetBegin() + static_cast<std::ptrdiff_t>(range.begin());
ValueType temp = this->Sum; ValueType temp = this->Sum;
for (vtkm::Id index = range.begin(); index != range.end(); for (vtkm::Id index = range.begin(); index != range.end();
++index, ++inIter, ++outIter) ++index, ++inIter, ++outIter)