ExecutionWholeArray now has consistent ValueType defines.
This commit is contained in:
parent
9f2b680594
commit
e462d34c60
@ -38,10 +38,11 @@ template<typename T,
|
||||
>
|
||||
class ExecutionWholeArray : public vtkm::exec::ExecutionObjectBase
|
||||
{
|
||||
typedef vtkm::cont::ArrayHandle<T,StorageTag> HandleType;
|
||||
typedef typename HandleType::template ExecutionTypes<DeviceAdapterTag>::Portal PortalType;
|
||||
|
||||
public:
|
||||
using ValueType = T;
|
||||
using HandleType = vtkm::cont::ArrayHandle<T,StorageTag>;
|
||||
using PortalType = typename HandleType::template ExecutionTypes<DeviceAdapterTag>::Portal;
|
||||
|
||||
VTKM_CONT
|
||||
ExecutionWholeArray( ):
|
||||
Portal( )
|
||||
@ -61,8 +62,6 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
typedef typename PortalType::ValueType ValueType;
|
||||
|
||||
VTKM_EXEC
|
||||
vtkm::Id GetNumberOfValues() const { return this->Portal.GetNumberOfValues(); }
|
||||
|
||||
@ -87,10 +86,11 @@ template<typename T,
|
||||
>
|
||||
class ExecutionWholeArrayConst : public vtkm::exec::ExecutionObjectBase
|
||||
{
|
||||
typedef vtkm::cont::ArrayHandle<T,StorageTag> HandleType;
|
||||
typedef typename HandleType::template ExecutionTypes<DeviceAdapterTag>::PortalConst PortalType;
|
||||
|
||||
public:
|
||||
using ValueType = T;
|
||||
using HandleType = vtkm::cont::ArrayHandle<T,StorageTag>;
|
||||
using PortalType = typename HandleType::template ExecutionTypes<DeviceAdapterTag>::PortalConst;
|
||||
|
||||
VTKM_CONT
|
||||
ExecutionWholeArrayConst( ):
|
||||
Portal( )
|
||||
@ -103,8 +103,6 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
typedef typename PortalType::ValueType ValueType;
|
||||
|
||||
VTKM_EXEC
|
||||
vtkm::Id GetNumberOfValues() const { return this->Portal.GetNumberOfValues(); }
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user