From: Matthias Maier <tamiko@43-1.org>
Date: Tue, 16 Nov 2021 19:14:15 +0000 (-0600)
Subject: TBB OneAPI: Update includes
X-Git-Tag: v9.4.0-rc1~754^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e3dff3ab8ebb22b47b100a9c1f2a67561a00af9;p=dealii.git

TBB OneAPI: Update includes
---

diff --git a/include/deal.II/base/work_stream.h b/include/deal.II/base/work_stream.h
index 13e23c3f8b..aa4060d80d 100644
--- a/include/deal.II/base/work_stream.h
+++ b/include/deal.II/base/work_stream.h
@@ -28,7 +28,11 @@
 #  include <deal.II/base/thread_management.h>
 
 #  ifdef DEAL_II_WITH_TBB
-#    include <tbb/pipeline.h>
+#    ifdef DEAL_II_TBB_WITH_ONEAPI
+#      include <tbb/parallel_pipeline.h>
+#    else
+#      include <tbb/pipeline.h>
+#    endif
 #  endif
 
 #  include <functional>
diff --git a/source/base/multithread_info.cc b/source/base/multithread_info.cc
index 9947d40197..aeed71a479 100644
--- a/source/base/multithread_info.cc
+++ b/source/base/multithread_info.cc
@@ -21,7 +21,11 @@
 #include <thread>
 
 #ifdef DEAL_II_WITH_TBB
-#  include <tbb/task_scheduler_init.h>
+#  ifdef DEAL_II_TBB_WITH_ONEAPI
+#    include <tbb/task_arena.h>
+#  else
+#    include <tbb/task_scheduler_init.h>
+#  endif
 #endif