Merge pull request #5813 from woltapp/tbbdeprecation

Partially fixes use of deprecated TBB features
This commit is contained in:
Denis Chapligin
2020-09-08 11:17:32 +03:00
committed by GitHub
18 changed files with 90 additions and 34 deletions
@@ -8,8 +8,13 @@
#include <boost/test/unit_test.hpp>
// make sure not to leak in recursive bisection
#if TBB_VERSION_MAJOR == 2020
#include <tbb/global_control.h>
tbb::global_control scheduler(tbb::global_control::max_allowed_parallelism, 2);
#else
#include <tbb/task_scheduler_init.h>
tbb::task_scheduler_init init(2);
#endif
using namespace osrm::partitioner;
using namespace osrm::util;