Deprecated tbb::task_scheduler_init replaced with std::thread and tbb::global_control

This commit is contained in:
Denis Chaplygin
2020-09-01 14:25:51 +03:00
parent 4d6272b030
commit 03d9e7a8ce
17 changed files with 85 additions and 33 deletions
@@ -6,7 +6,12 @@
#include <boost/test/test_case_template.hpp>
#include <boost/test/unit_test.hpp>
#include <tbb/tbb_stddef.h> // For version lookup
#if TBB_VERSION_MAJOR == 2020
#include <tbb/global_control.h>
#else
#include <tbb/task_scheduler_init.h>
#endif
using namespace osrm;
using namespace osrm::contractor;
@@ -16,7 +21,11 @@ BOOST_AUTO_TEST_SUITE(graph_contractor)
BOOST_AUTO_TEST_CASE(contract_graph)
{
#if TBB_VERSION_MAJOR == 2020
tbb::global_control scheduler(tbb::global_control::max_allowed_parallelism, 1);
#else
tbb::task_scheduler_init scheduler(1);
#endif
/*
* <--1--<
* (0) >--3--> (1) >--3--> (3)