From e462d34c60fec23771de1b62a8a13c0e2925055e Mon Sep 17 00:00:00 2001
From: Robert Maynard <robert.maynard@kitware.com>
Date: Wed, 23 Nov 2016 12:53:41 -0500
Subject: [PATCH] ExecutionWholeArray now has consistent ValueType defines.

---
 vtkm/exec/ExecutionWholeArray.h | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/vtkm/exec/ExecutionWholeArray.h b/vtkm/exec/ExecutionWholeArray.h
index 727158e5a..802c49c12 100644
--- a/vtkm/exec/ExecutionWholeArray.h
+++ b/vtkm/exec/ExecutionWholeArray.h
@@ -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(); }