Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 02:25:42 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Correct warnings for using TBB 2020 deprecated functions

Browse Source
This commit is contained in:
Robert Maynard 2020-06-01 16:58:02 -04:00
parent dbe73db742
commit 97a2408fc4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/cont/tbb/internal/ParallelSortTBB.cxx
View File

@ -54,7 +54,7 @@
#include <vtkm/internal/Windows.h>
#include <tbb/task.h>
#include <tbb/tbb_thread.h>
#include <thread>
#if defined(VTKM_MSVC)
#pragma pop_macro("__TBB_NO_IMPLICITLINKAGE")
@ -69,7 +69,7 @@ namespace tbb
namespace sort
{
const size_t MAX_CORES = ::tbb::tbb_thread::hardware_concurrency();
const size_t MAX_CORES = std::thread::hardware_concurrency();
// Simple TBB task wrapper around a generic functor.
template <typename FunctorType>