]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Suppress more TBB warnings 10032/head
authorDaniel Arndt <arndtd@ornl.gov>
Tue, 5 May 2020 01:49:15 +0000 (21:49 -0400)
committerDaniel Arndt <arndtd@ornl.gov>
Tue, 5 May 2020 01:50:11 +0000 (21:50 -0400)
source/base/multithread_info.cc
source/matrix_free/task_info.cc
tests/quick_tests/tbb.cc

index 9e5bdefa158b3a9283a70cf5e003e74468e544ba..d777f9657735bd3f2660a91e6430884d57c779c1 100644 (file)
@@ -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
index 6860e759aeb26e15134d0cbbfa646200ddc1dccf..cbae4ea508e60c3fa95312de07e14c87c8efc42f 100644 (file)
@@ -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>
index b8ff84462c45e9873ce09b609d2dcd2816a38717..ed444b30ec9f03516f317071be997e01fccc4be7 100644 (file)
@@ -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>
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.