From a771359d7222b835043481c24139ecc36bf9d39d Mon Sep 17 00:00:00 2001
From: Kenneth Moreland <morelandkd@ornl.gov>
Date: Wed, 9 Feb 2022 13:56:26 -0700
Subject: [PATCH] Remove brigand from FunctionInterface

Replace with features in `vtkm::List`.
---
 vtkm/internal/FunctionInterfaceDetailPre.h    | 9 ++++-----
 vtkm/internal/FunctionInterfaceDetailPre.h.in | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/vtkm/internal/FunctionInterfaceDetailPre.h b/vtkm/internal/FunctionInterfaceDetailPre.h
index 93d178f74..a33498c2f 100644
--- a/vtkm/internal/FunctionInterfaceDetailPre.h
+++ b/vtkm/internal/FunctionInterfaceDetailPre.h
@@ -17,13 +17,12 @@
 #error FunctionInterfaceDetailPre.h must be included from FunctionInterface.h
 #endif
 
+#include <vtkm/List.h>
 #include <vtkm/Types.h>
 #include <vtkm/internal/IndexTag.h>
 
 #include <type_traits>
 
-#include <vtkm/internal/brigand.hpp>
-
 #define VTKM_MAX_FUNCTION_PARAMETERS 20
 
 
@@ -600,8 +599,8 @@ struct FunctionSigInfo<R(ArgTypes...)>
   using ArityType = std::integral_constant<int, static_cast<int>(Arity)>;
 
   using ResultType = R;
-  using Components = brigand::list<R, ArgTypes...>;
-  using Parameters = brigand::list<ArgTypes...>;
+  using Components = vtkm::List<R, ArgTypes...>;
+  using Parameters = vtkm::List<ArgTypes...>;
 };
 
 template <int, typename>
@@ -609,7 +608,7 @@ struct AtType;
 template <int Index, typename R, typename... ArgTypes>
 struct AtType<Index, R(ArgTypes...)>
 {
-  using type = brigand::at_c<brigand::list<R, ArgTypes...>, Index>;
+  using type = vtkm::ListAt<vtkm::List<R, ArgTypes...>, Index>;
 };
 
 //============================================================================
diff --git a/vtkm/internal/FunctionInterfaceDetailPre.h.in b/vtkm/internal/FunctionInterfaceDetailPre.h.in
index 6f8fd07e2..46ccf71d2 100644
--- a/vtkm/internal/FunctionInterfaceDetailPre.h.in
+++ b/vtkm/internal/FunctionInterfaceDetailPre.h.in
@@ -29,13 +29,12 @@ $# Ignore the following comment. It is meant for the generated file.
 #error FunctionInterfaceDetailPre.h must be included from FunctionInterface.h
 #endif
 
+#include <vtkm/List.h>
 #include <vtkm/Types.h>
 #include <vtkm/internal/IndexTag.h>
 
 #include <type_traits>
 
-#include <vtkm/internal/brigand.hpp>
-
 $py(max_parameters=20)\
 #define VTKM_MAX_FUNCTION_PARAMETERS $(max_parameters)
 
@@ -131,8 +130,8 @@ struct FunctionSigInfo<R(ArgTypes...)>
   using ArityType = std::integral_constant<int, static_cast<int>(Arity)>;
 
   using ResultType = R;
-  using Components = brigand::list<R, ArgTypes...>;
-  using Parameters = brigand::list<ArgTypes...>;
+  using Components = vtkm::List<R, ArgTypes...>;
+  using Parameters = vtkm::List<ArgTypes...>;
 };
 
 template <int, typename>
@@ -140,7 +139,7 @@ struct AtType;
 template <int Index, typename R, typename... ArgTypes>
 struct AtType<Index, R(ArgTypes...)>
 {
-  using type = brigand::at_c<brigand::list<R, ArgTypes...>, Index>;
+  using type = vtkm::ListAt<vtkm::List<R, ArgTypes...>, Index>;
 };
 
 //============================================================================