From 1432b160d5be24f9da32362ddc001256f5b60d9d Mon Sep 17 00:00:00 2001
From: Kenneth Moreland <kmorel@sandia.gov>
Date: Tue, 29 Sep 2015 16:06:39 -0400
Subject: [PATCH] Remove const from ArrayPortalGroupVec.

Remove the const from the ValueType of the delegate portal in
ArrayPortalGroupVec. This was creating a Vec with a const type, which
was immutable, which was problematic when trying to create the Vec in
the first place.
---
 vtkm/cont/ArrayHandleGroupVec.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/vtkm/cont/ArrayHandleGroupVec.h b/vtkm/cont/ArrayHandleGroupVec.h
index ba21c96be..732792ebd 100644
--- a/vtkm/cont/ArrayHandleGroupVec.h
+++ b/vtkm/cont/ArrayHandleGroupVec.h
@@ -25,6 +25,10 @@
 #include <vtkm/cont/Assert.h>
 #include <vtkm/cont/ErrorControlBadValue.h>
 
+VTKM_THIRDPARTY_PRE_INCLUDE
+#include <boost/type_traits/remove_const.hpp>
+VTKM_THIRDPARTY_POST_INCLUDE
+
 namespace vtkm {
 namespace cont {
 
@@ -37,8 +41,10 @@ public:
   static const vtkm::IdComponent NUM_COMPONENTS = _NUM_COMPONENTS;
   typedef _SourcePortalType SourcePortalType;
 
-  typedef vtkm::Vec<typename SourcePortalType::ValueType, NUM_COMPONENTS>
-      ValueType;
+  typedef typename
+    boost::remove_const<typename SourcePortalType::ValueType>::type
+      ComponentType;
+  typedef vtkm::Vec<ComponentType, NUM_COMPONENTS> ValueType;
 
   VTKM_SUPPRESS_EXEC_WARNINGS
   VTKM_EXEC_CONT_EXPORT