From e691b2c00359e5b5f107b7c4ebd0107b24cb352c Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 4 May 2020 21:49:15 -0400 Subject: [PATCH] Suppress more TBB warnings --- source/base/multithread_info.cc | 2 ++ source/matrix_free/task_info.cc | 2 +- tests/quick_tests/tbb.cc | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) 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 #ifdef DEAL_II_WITH_THREADS +# define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 # include +# 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 # define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 # include -# undef TBB_SUPPRESS_DEPRECATED_MESSAGES # include +# undef TBB_SUPPRESS_DEPRECATED_MESSAGES #endif #include 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 #include +#define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 #include +#undef TBB_SUPPRESS_DEPRECATED_MESSAGES #include -- 2.39.5