From 9991179e6dcd27786438198894ac3b7c64259fcc Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 14 May 2020 18:10:32 -0400 Subject: [PATCH] Do not use auto return type; it's not supported until C++14. --- vtkm/cont/CellSetExplicit.h | 4 +++- vtkm/cont/CellSetExplicit.hxx | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vtkm/cont/CellSetExplicit.h b/vtkm/cont/CellSetExplicit.h index 7877a7726..261ea25bf 100644 --- a/vtkm/cont/CellSetExplicit.h +++ b/vtkm/cont/CellSetExplicit.h @@ -186,7 +186,9 @@ public: VTKM_CONT vtkm::IdComponent GetNumberOfPointsInCell(vtkm::Id cellid) const override; VTKM_CONT void GetCellPointIds(vtkm::Id id, vtkm::Id* ptids) const override; - VTKM_CONT auto ShapesReadPortal() const; + VTKM_CONT typename vtkm::cont::ArrayHandle::ReadPortalType + ShapesReadPortal() const; + VTKM_CONT vtkm::UInt8 GetCellShape(vtkm::Id cellid) const override; template diff --git a/vtkm/cont/CellSetExplicit.hxx b/vtkm/cont/CellSetExplicit.hxx index 7ff00e367..da7ec8e99 100644 --- a/vtkm/cont/CellSetExplicit.hxx +++ b/vtkm/cont/CellSetExplicit.hxx @@ -176,7 +176,8 @@ vtkm::IdComponent CellSetExplicit template VTKM_CONT -auto CellSetExplicit::ShapesReadPortal() const +typename vtkm::cont::ArrayHandle::ReadPortalType +CellSetExplicit::ShapesReadPortal() const { return this->Data->CellPointIds.Shapes.ReadPortal(); }