Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix template issue with IteratorFromArrayPortal

Browse Source 
I don't know why, but under some circumstances when compiling with CUDA
and Visual Studio, the compiler was giving syntax errors when the
IteratorFromArrayPortal was using the typename keyword to reference a
type in its superclass. Get around the problem by looking directly in
the superclass.
This commit is contained in:
Kenneth Moreland 2016-06-27 14:30:02 -06:00
parent d7ed37cd1e
commit 6dbff1b778
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vtkm/cont/internal/IteratorFromArrayPortal.h
View File

@ -88,6 +88,12 @@ class IteratorFromArrayPortal : public
boost::random_access_traversal_tag,
detail::IteratorFromArrayPortalValue<ArrayPortalType> >
{
typedef boost::iterator_facade<
IteratorFromArrayPortal<ArrayPortalType>,
typename ArrayPortalType::ValueType,
boost::random_access_traversal_tag,
detail::IteratorFromArrayPortalValue<ArrayPortalType> > Superclass;
public:
VTKM_CONT_EXPORT
@ -148,8 +154,7 @@ private:
}
VTKM_CONT_EXPORT
void advance(
typename IteratorFromArrayPortal<ArrayPortalType>::difference_type delta)
void advance(typename Superclass::difference_type delta)
{
this->Index += static_cast<vtkm::Id>(delta);
VTKM_ASSERT(this->Index >= 0);
@ -157,7 +162,7 @@ private:
}
VTKM_CONT_EXPORT
typename IteratorFromArrayPortal<ArrayPortalType>::difference_type
typename Superclass::difference_type
distance_to(const IteratorFromArrayPortal<ArrayPortalType> &other) const
{
// Technically, we should probably check that the portals are the same,