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

DynamicArrayHandle Casting methods now holds by const * const.

Browse Source 
This is to make it more clear to developers that the handle is a
reference that could be NULL.
This commit is contained in:
Robert Maynard 2016-01-18 16:50:40 -05:00
parent c1560e2d3f
commit 6fb86da8f9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vtkm/cont/DynamicArrayHandle.h
View File

@ -425,14 +425,14 @@ namespace detail {
template<typename Functor, typename Type>
struct DynamicArrayHandleTryStorage {
const DynamicArrayHandle& Array;
const DynamicArrayHandle* const Array;
const Functor &Function;
bool FoundCast;
VTKM_CONT_EXPORT
DynamicArrayHandleTryStorage(const DynamicArrayHandle &array,
const Functor &f)
: Array(array), Function(f), FoundCast(false) { }
: Array(&array), Function(f), FoundCast(false) { }
template<typename Storage>
VTKM_CONT_EXPORT
@ -446,9 +446,9 @@ private:
void DoCast(Storage, boost::mpl::bool_<true>)
{
if (!this->FoundCast &&
this->Array.template IsTypeAndStorage<Type,Storage>())
this->Array->template IsTypeAndStorage<Type,Storage>())
{
this->Function(this->Array.template CastToTypeStorage<Type,Storage>());
this->Function(this->Array->template CastToTypeStorage<Type,Storage>());
this->FoundCast = true;
}
}
@ -462,13 +462,13 @@ private:
template<typename Functor, typename StorageList>
struct DynamicArrayHandleTryType {
const DynamicArrayHandle& Array;
const DynamicArrayHandle* const Array;
const Functor &Function;
bool FoundCast;
VTKM_CONT_EXPORT
DynamicArrayHandleTryType(const DynamicArrayHandle &array, const Functor &f)
: Array(array), Function(f), FoundCast(false) { }
: Array(&array), Function(f), FoundCast(false) { }
template<typename Type>
VTKM_CONT_EXPORT
@ -476,7 +476,7 @@ struct DynamicArrayHandleTryType {
if (this->FoundCast) { return; }
typedef DynamicArrayHandleTryStorage<Functor, Type> TryStorageType;
TryStorageType tryStorage =
TryStorageType(this->Array, this->Function);
TryStorageType(*this->Array, this->Function);
vtkm::ListForEach(tryStorage, StorageList());
if (tryStorage.FoundCast)
{