From 917919569c92ad6a3b7c137bb1df3d9447792b82 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 2 Apr 2020 11:22:09 -0400 Subject: [PATCH] contour_tree_augmented example compiles when TBB is enabled Fixes #486 --- examples/contour_tree_augmented/ContourTreeApp.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/contour_tree_augmented/ContourTreeApp.cxx b/examples/contour_tree_augmented/ContourTreeApp.cxx index dd31312f7..ec4b57f8e 100644 --- a/examples/contour_tree_augmented/ContourTreeApp.cxx +++ b/examples/contour_tree_augmented/ContourTreeApp.cxx @@ -230,13 +230,13 @@ int main(int argc, char* argv[]) if (parser.hasOption("--numThreads")) { // Print warning about mismatch between the --numThreads and -d/--device opton - VTKM_LOG_S_IF(vtkm::cont::LogLevel::Warn, - device != vtkm::cont::DeviceAdapterTagTBB, + VTKM_LOG_IF_S(vtkm::cont::LogLevel::Warn, + device != vtkm::cont::DeviceAdapterTagTBB{}, "WARNING: Mismatch between --numThreads and -d/--device option." "numThreads option requires the use of TBB as device. " "Ignoring the numThread option."); // Set the number of threads to be used for TBB - if (device == vtkm::cont::DeviceAdapterTagTBB) + if (device == vtkm::cont::DeviceAdapterTagTBB{}) { numThreads = std::stoi(parser.getOption("--numThreads")); tbb::task_scheduler_init schedulerInit(numThreads);