An update will be applied December 9th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit 640aa69b authored by Robert Maynard's avatar Robert Maynard
Browse files

ArrayPortalFromIterators uses the GetIteratorBegin method signature.

This makes all the custom ArrayPortals have the same syntax,
which is nice when writing new backends.
parent 9c1012b7
...@@ -41,6 +41,7 @@ class ArrayPortalFromIterators ...@@ -41,6 +41,7 @@ class ArrayPortalFromIterators
{ {
public: public:
typedef typename std::iterator_traits<IteratorT>::value_type ValueType; typedef typename std::iterator_traits<IteratorT>::value_type ValueType;
typedef IteratorT IteratorType;
VTKM_CONT_EXPORT ArrayPortalFromIterators() { } VTKM_CONT_EXPORT ArrayPortalFromIterators() { }
...@@ -69,7 +70,7 @@ public: ...@@ -69,7 +70,7 @@ public:
template<class OtherIteratorT> template<class OtherIteratorT>
VTKM_CONT_EXPORT VTKM_CONT_EXPORT
ArrayPortalFromIterators(const ArrayPortalFromIterators<OtherIteratorT> &src) ArrayPortalFromIterators(const ArrayPortalFromIterators<OtherIteratorT> &src)
: BeginIterator(src.GetRawIterator()), NumberOfValues(src.GetNumberOfValues()) : BeginIterator(src.GetIteratorBegin()), NumberOfValues(src.GetNumberOfValues())
{ } { }
VTKM_CONT_EXPORT VTKM_CONT_EXPORT
...@@ -91,7 +92,7 @@ public: ...@@ -91,7 +92,7 @@ public:
} }
VTKM_CONT_EXPORT VTKM_CONT_EXPORT
IteratorT GetRawIterator() const { IteratorT GetIteratorBegin() const {
return this->BeginIterator; return this->BeginIterator;
} }
...@@ -132,7 +133,7 @@ public: ...@@ -132,7 +133,7 @@ public:
VTKM_CONT_EXPORT VTKM_CONT_EXPORT
ArrayPortalToIterators(const PortalType &portal) ArrayPortalToIterators(const PortalType &portal)
: Iterator(portal.GetRawIterator()), : Iterator(portal.GetIteratorBegin()),
NumberOfValues(portal.GetNumberOfValues()) NumberOfValues(portal.GetNumberOfValues())
{ } { }
...@@ -144,7 +145,7 @@ public: ...@@ -144,7 +145,7 @@ public:
VTKM_CONT_EXPORT VTKM_CONT_EXPORT
ArrayPortalToIterators(const PortalType &portal) ArrayPortalToIterators(const PortalType &portal)
: Iterator(portal.GetRawIterator(), portal.GetNumberOfValues()), : Iterator(portal.GetIteratorBegin(), portal.GetNumberOfValues()),
NumberOfValues(portal.GetNumberOfValues()) NumberOfValues(portal.GetNumberOfValues())
{ } { }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment