diff --git a/benchmarking/Benchmarker.h b/benchmarking/Benchmarker.h index deefe3bb2..e6dd8deff 100644 --- a/benchmarking/Benchmarker.h +++ b/benchmarking/Benchmarker.h @@ -16,7 +16,9 @@ #include #include -#include +#include + +#include #include @@ -265,9 +267,9 @@ static ::benchmark::internal::Function* GetFunction() { return BenchFunc; } \ }; \ } /* end anon namespace */ \ - int BENCHMARK_PRIVATE_NAME(BenchFunc) = vtkm::bench::detail::GenerateTemplateBenchmarks< \ - brigand::bind, \ - TypeList>::Register(#BenchFunc, ApplyFunctor) + int BENCHMARK_PRIVATE_NAME(BenchFunc) = \ + vtkm::bench::detail::GenerateTemplateBenchmarks::Register(#BenchFunc, ApplyFunctor) // Internal use only: #define VTKM_BENCHMARK_WRAPPER_NAME(BenchFunc) \ @@ -286,17 +288,14 @@ static inline void NullApply(::benchmark::internal::Benchmark*) {} /// instead. // TypeLists could be expanded to compute cross products if we ever have that // need. -template -struct GenerateTemplateBenchmarks; - template