From: Daniel Arndt <arndtd@ornl.gov>
Date: Tue, 5 May 2020 01:49:15 +0000 (-0400)
Subject: Suppress more TBB warnings
X-Git-Tag: v9.2.0-rc1~131^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e691b2c00359e5b5f107b7c4ebd0107b24cb352c;p=dealii.git

Suppress more TBB warnings
---

diff --git a/source/base/multithread_info.cc b/source/base/multithread_info.cc
index 9e5bdefa15..d777f96577 100644
--- 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 6860e759ae..cbae4ea508 100644
--- 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 b8ff84462c..ed444b30ec 100644
--- 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>