From 5fe678a42bc6efd8fcf4b21f53bb1157e7803133 Mon Sep 17 00:00:00 2001
From: Daniel Arndt <arndtd@ornl.gov>
Date: Sun, 28 Jun 2020 11:03:09 -0400
Subject: [PATCH] Suppress TBB deprecation warnings

---
 include/deal.II/base/config.h.in | 3 ++-
 source/base/multithread_info.cc  | 2 --
 source/matrix_free/task_info.cc  | 2 --
 tests/quick_tests/tbb.cc         | 2 --
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index db6b33f397..583ff192c0 100644
--- 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 d2d4628980..9947d40197 100644
--- 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 0f352297e4..c071c9dc76 100644
--- 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 4b21499962..5791dc14d9 100644
--- 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>
 
-- 
2.39.5