From a52211e565f3b32f3db3135b323ecaa457f0a13f Mon Sep 17 00:00:00 2001
From: Kenneth Moreland <kmorel@sandia.gov>
Date: Thu, 10 Jan 2019 16:00:32 -0700
Subject: [PATCH] Fix conversion errors in benchmarking code

The recent removal of type selectors in ControlSignature field tags
means that the BenchmarkFieldAlgorithms code was creating code paths
that were never followed and lead to impossible type conversions (e.g.
Vec to float). Fixed the problem by specifing the types for the
VariantArrayHandles better.
---
 benchmarking/BenchmarkFieldAlgorithms.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/benchmarking/BenchmarkFieldAlgorithms.cxx b/benchmarking/BenchmarkFieldAlgorithms.cxx
index 855623074..89122a1c0 100644
--- a/benchmarking/BenchmarkFieldAlgorithms.cxx
+++ b/benchmarking/BenchmarkFieldAlgorithms.cxx
@@ -320,7 +320,7 @@ class BenchmarkFieldAlgorithms
 
   using ValueVariantHandle = vtkm::cont::VariantArrayHandleBase<ValueTypes>;
   using InterpVariantHandle = vtkm::cont::VariantArrayHandleBase<InterpValueTypes>;
-  using IdVariantHandle = vtkm::cont::VariantArrayHandleBase<vtkm::TypeListTagIndex>;
+  using EdgeIdVariantHandle = vtkm::cont::VariantArrayHandleBase<vtkm::TypeListTagId2>;
 
 private:
   template <typename Value>
@@ -662,8 +662,8 @@ private:
     vtkm::Float64 operator()()
     {
       InterpVariantHandle dfield(this->FieldHandle);
-      InterpVariantHandle dweight(this->WeightHandle);
-      IdVariantHandle dedges(this->EdgePairHandle);
+      ValueVariantHandle dweight(this->WeightHandle);
+      EdgeIdVariantHandle dedges(this->EdgePairHandle);
       vtkm::cont::ArrayHandle<Value> result;
 
       Timer timer;