From: Martin Kronbichler <kronbichler@lnm.mw.tum.de>
Date: Mon, 13 May 2019 15:54:10 +0000 (+0200)
Subject: Disable diagnostics pragma in a few boost and tbb headers
X-Git-Tag: v9.1.0-rc1~20^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8139%2Fhead;p=dealii.git

Disable diagnostics pragma in a few boost and tbb headers
---

diff --git a/include/deal.II/base/graph_coloring.h b/include/deal.II/base/graph_coloring.h
index 62927a301c..106a885eb2 100644
--- a/include/deal.II/base/graph_coloring.h
+++ b/include/deal.II/base/graph_coloring.h
@@ -24,8 +24,10 @@
 
 #  include <deal.II/lac/sparsity_tools.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <boost/unordered_map.hpp>
 #  include <boost/unordered_set.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <functional>
 #  include <set>
diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h
index 963eaa3779..bb77c79315 100644
--- a/include/deal.II/base/patterns.h
+++ b/include/deal.II/base/patterns.h
@@ -30,11 +30,13 @@
 
 #include <deal.II/fe/component_mask.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/archive/basic_archive.hpp>
 #include <boost/core/demangle.hpp>
 #include <boost/property_tree/ptree_fwd.hpp>
 #include <boost/property_tree/ptree_serialization.hpp>
 #include <boost/serialization/split_member.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <array>
 #include <deque>
diff --git a/include/deal.II/base/point.h b/include/deal.II/base/point.h
index 5a39717d5e..a47b6238d2 100644
--- a/include/deal.II/base/point.h
+++ b/include/deal.II/base/point.h
@@ -22,7 +22,9 @@
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/tensor.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/geometry.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <cmath>
 
diff --git a/include/deal.II/base/thread_local_storage.h b/include/deal.II/base/thread_local_storage.h
index 12c9fd0827..b731ca6137 100644
--- a/include/deal.II/base/thread_local_storage.h
+++ b/include/deal.II/base/thread_local_storage.h
@@ -19,9 +19,11 @@
 
 #  include <deal.II/base/config.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  ifdef DEAL_II_WITH_THREADS
 #    include <tbb/enumerable_thread_specific.h>
 #  endif
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 
diff --git a/include/deal.II/base/thread_management.h b/include/deal.II/base/thread_management.h
index 7e7294b571..14c49a49ff 100644
--- a/include/deal.II/base/thread_management.h
+++ b/include/deal.II/base/thread_management.h
@@ -32,6 +32,7 @@
 #  include <tuple>
 #  include <utility>
 #  include <vector>
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  ifdef DEAL_II_WITH_THREADS
 #    include <thread>
 #    ifdef DEAL_II_USE_MT_POSIX
@@ -40,6 +41,7 @@
 #    include <tbb/task.h>
 #    include <tbb/tbb_stddef.h>
 #  endif
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 
diff --git a/include/deal.II/base/utilities.h b/include/deal.II/base/utilities.h
index 8017a392ed..03783c57a7 100644
--- a/include/deal.II/base/utilities.h
+++ b/include/deal.II/base/utilities.h
@@ -40,6 +40,8 @@
 #  endif
 #endif
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/core/demangle.hpp>
@@ -54,6 +56,8 @@
 #  include <boost/iostreams/stream.hpp>
 #endif
 
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 DEAL_II_NAMESPACE_OPEN
 
 // forward declare Point
diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h
index 0aedc2af2d..6e2b4c1165 100644
--- a/include/deal.II/matrix_free/matrix_free.templates.h
+++ b/include/deal.II/matrix_free/matrix_free.templates.h
@@ -40,7 +40,9 @@
 #ifdef DEAL_II_WITH_THREADS
 #  include <deal.II/base/parallel.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <tbb/concurrent_unordered_map.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 #include <fstream>