Changes to computing bounds to allow custom types and storage.

vtkm/cont/CoordinateSystem.h

@@ -140,14 +140,14 @@ public:
           this->Superclass::GetData());
   }
 
-  template<typename DeviceAdapterTag, typename TypeList>
+  template<typename DeviceAdapterTag>
   VTKM_CONT_EXPORT
-  const vtkm::cont::ArrayHandle<vtkm::Float64>& GetBounds(DeviceAdapterTag,
-                                                          TypeList) const
+  void GetBounds(vtkm::Float64 *bounds, DeviceAdapterTag) const
   {
-    return this->Superclass::GetBounds(
+    this->Superclass::GetBounds(
+          bounds,
           DeviceAdapterTag(),
-          TypeList(),
+          VTKM_DEFAULT_COORDINATE_SYSTEM_TYPE_LIST_TAG(),
           VTKM_DEFAULT_COORDINATE_SYSTEM_STORAGE_LIST_TAG());
   }
 
@@ -156,11 +156,23 @@ public:
   void GetBounds(vtkm::Float64 *bounds, DeviceAdapterTag, TypeList) const
   {
     this->Superclass::GetBounds(
-          bounds, DeviceAdapterTag(),
+          bounds,
+          DeviceAdapterTag(),
           TypeList(),
           VTKM_DEFAULT_COORDINATE_SYSTEM_STORAGE_LIST_TAG());
   }
 
+  template<typename DeviceAdapterTag, typename TypeList, typename StorageList>
+  VTKM_CONT_EXPORT
+  void GetBounds(vtkm::Float64 *bounds, DeviceAdapterTag, TypeList, StorageList) const
+  {
+    this->Superclass::GetBounds(
+          bounds,
+          DeviceAdapterTag(),
+          TypeList(),
+          StorageList());
+  }
+
   template<typename DeviceAdapterTag>
   VTKM_CONT_EXPORT
   const vtkm::cont::ArrayHandle<vtkm::Float64>& GetBounds(DeviceAdapterTag) const
@@ -171,17 +183,31 @@ public:
           VTKM_DEFAULT_COORDINATE_SYSTEM_STORAGE_LIST_TAG());
   }
 
-  template<typename DeviceAdapterTag>
+  template<typename DeviceAdapterTag, typename TypeList>
   VTKM_CONT_EXPORT
-  void GetBounds(vtkm::Float64 *bounds, DeviceAdapterTag) const
+  const vtkm::cont::ArrayHandle<vtkm::Float64>& GetBounds(DeviceAdapterTag,
+                                                          TypeList) const
   {
-    this->Superclass::GetBounds(
-          bounds,
+    return this->Superclass::GetBounds(
           DeviceAdapterTag(),
-          VTKM_DEFAULT_COORDINATE_SYSTEM_TYPE_LIST_TAG(),
+          TypeList(),
           VTKM_DEFAULT_COORDINATE_SYSTEM_STORAGE_LIST_TAG());
   }
 
+  template<typename DeviceAdapterTag, typename TypeList, typename StorageList>
+  VTKM_CONT_EXPORT
+  const vtkm::cont::ArrayHandle<vtkm::Float64>& GetBounds(DeviceAdapterTag,
+                                                          TypeList,
+                                                          StorageList) const
+  {
+    return this->Superclass::GetBounds(
+          DeviceAdapterTag(),
+          TypeList(),
+          StorageList());
+  }
+
+
+
   VTKM_CONT_EXPORT
   virtual void PrintSummary(std::ostream &out) const
   {