Merge topic 'correct_contour_tree_augmented_example_compile_failures'

917919569 contour_tree_augmented example compiles when TBB is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2024
This commit is contained in:
Robert Maynard 2020-04-02 19:09:04 +00:00 committed by Kitware Robot
commit e9129312f5

@ -230,13 +230,13 @@ int main(int argc, char* argv[])
if (parser.hasOption("--numThreads")) if (parser.hasOption("--numThreads"))
{ {
// Print warning about mismatch between the --numThreads and -d/--device opton // Print warning about mismatch between the --numThreads and -d/--device opton
VTKM_LOG_S_IF(vtkm::cont::LogLevel::Warn, VTKM_LOG_IF_S(vtkm::cont::LogLevel::Warn,
device != vtkm::cont::DeviceAdapterTagTBB, device != vtkm::cont::DeviceAdapterTagTBB{},
"WARNING: Mismatch between --numThreads and -d/--device option." "WARNING: Mismatch between --numThreads and -d/--device option."
"numThreads option requires the use of TBB as device. " "numThreads option requires the use of TBB as device. "
"Ignoring the numThread option."); "Ignoring the numThread option.");
// Set the number of threads to be used for TBB // 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")); numThreads = std::stoi(parser.getOption("--numThreads"));
tbb::task_scheduler_init schedulerInit(numThreads); tbb::task_scheduler_init schedulerInit(numThreads);