Suppress TBB deprecation warnings

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index db6b33f397a08c4de84a1f94ed905ecba5328d23..583ff192c0600086aea4229a882b9d86f8b31d1e 100644 (file)
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -64,12 +64,13 @@
 #cmakedefine DEAL_II_WITH_UMFPACK
 #cmakedefine DEAL_II_WITH_ZLIB
 
+#ifdef DEAL_II_WITH_TBB
 /*
  * Backward compatibility setting:
  * FIXME: Update once transition to taskflow is complete
  */
-#ifdef DEAL_II_WITH_TBB
 #define DEAL_II_WITH_THREADS
+#define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
 #endif
 
 /***********************************************************************

diff --git a/source/base/multithread_info.cc b/source/base/multithread_info.cc
index d2d462898021e4b128f7c8b93adbcbf860310f6d..9947d40197ec984bc8adb8683dd0c7685ac1786a 100644 (file)
--- a/source/base/multithread_info.cc
+++ b/source/base/multithread_info.cc
@@ -21,9 +21,7 @@
 #include <thread>
 
 #ifdef DEAL_II_WITH_TBB
-#  define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
 #  include <tbb/task_scheduler_init.h>
-#  undef TBB_SUPPRESS_DEPRECATED_MESSAGES
 #endif
 
 

diff --git a/source/matrix_free/task_info.cc b/source/matrix_free/task_info.cc
index 0f352297e46837b2298d6c3631872e090fc87d6d..c071c9dc7612ee13714ea5f4cfd6e4efc6142e40 100644 (file)
--- a/source/matrix_free/task_info.cc
+++ b/source/matrix_free/task_info.cc
@@ -27,10 +27,8 @@
 #ifdef DEAL_II_WITH_TBB
 #  include <tbb/blocked_range.h>
 #  include <tbb/parallel_for.h>
-#  define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
 #  include <tbb/task.h>
 #  include <tbb/task_scheduler_init.h>
-#  undef TBB_SUPPRESS_DEPRECATED_MESSAGES
 #endif
 
 #include <iostream>

diff --git a/tests/quick_tests/tbb.cc b/tests/quick_tests/tbb.cc
index 4b214999621ae9ee1b524358bea579153c9371a0..5791dc14d93cb1cc9a9577ea15fce01a94b16e94 100644 (file)
--- a/tests/quick_tests/tbb.cc
+++ b/tests/quick_tests/tbb.cc
@@ -18,9 +18,7 @@
 #include <deal.II/base/thread_management.h>
 #include <deal.II/base/work_stream.h>
 
-#define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
 #include <tbb/task_scheduler_init.h>
-#undef TBB_SUPPRESS_DEPRECATED_MESSAGES
 
 #include <iostream>