Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt 8 to resolve Windows compiler warning with streaming storage

Browse Source
This commit is contained in:
Christopher Sewell 2016-10-21 10:58:14 -06:00
parent c540a699f2
commit f1af30804e
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/internal/DeviceAdapterAlgorithmGeneral.h
View File

@ -311,7 +311,7 @@ public:
//--------------------------------------------------------------------------
// Streaming Reduce
#if 0
// #if 0
template<typename T, class CIn>
VTKM_CONT_EXPORT static T StreamingReduce(
const vtkm::Id numBlocks,
@ -320,9 +320,9 @@ public:
{
return DerivedAlgorithm::StreamingReduce(numBlocks, input, initialValue, vtkm::internal::Add());
}
#endif
//#endif
template<typename T, class CIn, class BinaryFunctor>
VTKM_CONT_EXPORT /*static*/ T StreamingReduce(
VTKM_CONT_EXPORT static T StreamingReduce(
const vtkm::Id numBlocks,
const vtkm::cont::ArrayHandle<T,CIn>& input,
T initialValue,
@ -343,10 +343,10 @@ public:
vtkm::cont::ArrayHandleStreaming<vtkm::cont::ArrayHandle<T,CIn> >(
input, block, blockSize, numberOfInstances);
//if (block == 0)
if (block == 0)
lastResult = DerivedAlgorithm::Reduce(streamIn, initialValue, binary_functor);
//else
// lastResult = DerivedAlgorithm::Reduce(streamIn, lastResult, binary_functor);
else
lastResult = DerivedAlgorithm::Reduce(streamIn, lastResult, binary_functor);
}
return lastResult;
}