Suppress more TBB warnings

diff --git a/source/base/multithread_info.cc b/source/base/multithread_info.cc
index 9e5bdefa158b3a9283a70cf5e003e74468e544ba..d777f9657735bd3f2660a91e6430884d57c779c1 100644 (file)
--- a/source/base/multithread_info.cc
+++ b/source/base/multithread_info.cc
@@ -28,7 +28,9 @@
 #include <algorithm>
 
 #ifdef DEAL_II_WITH_THREADS
+#  define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
 #  include <tbb/task_scheduler_init.h>
+#  undef TBB_SUPPRESS_DEPRECATED_MESSAGES
 #endif
 
 DEAL_II_NAMESPACE_OPEN

diff --git a/source/matrix_free/task_info.cc b/source/matrix_free/task_info.cc
index 6860e759aeb26e15134d0cbbfa646200ddc1dccf..cbae4ea508e60c3fa95312de07e14c87c8efc42f 100644 (file)
--- a/source/matrix_free/task_info.cc
+++ b/source/matrix_free/task_info.cc
@@ -29,8 +29,8 @@
 #  include <tbb/parallel_for.h>
 #  define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
 #  include <tbb/task.h>
-#  undef TBB_SUPPRESS_DEPRECATED_MESSAGES
 #  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 b8ff84462c45e9873ce09b609d2dcd2816a38717..ed444b30ec9f03516f317071be997e01fccc4be7 100644 (file)
--- a/tests/quick_tests/tbb.cc
+++ b/tests/quick_tests/tbb.cc
@@ -18,7 +18,9 @@
 #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>