From 72dc1f45b55bde39f6a80bbfefae03acc7d5a880 Mon Sep 17 00:00:00 2001
From: Timo Heister <timo.heister@gmail.com>
Date: Mon, 15 Feb 2016 09:04:00 -0500
Subject: [PATCH] more DISABLE_EXTRA_DIAGNOSTICS guards

---
 include/deal.II/base/config.h.in        |  1 +
 include/deal.II/base/std_cxx11/thread.h |  3 +++
 source/base/polynomials_bernstein.cc    | 17 +++++++++++++++++
 source/base/utilities.cc                |  2 +-
 source/lac/sparsity_tools.cc            |  2 ++
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index 98a31e8974..d6c5f0348e 100644
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -285,6 +285,7 @@ _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"")         \
 _Pragma("GCC diagnostic ignored \"-Wunused-variable\"")          \
 _Pragma("GCC diagnostic ignored \"-Wtype-limits\"")              \
 _Pragma("GCC diagnostic ignored \"-Wtautological-constant-out-of-range-compare\"") \
+_Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") \
 _Pragma("GCC diagnostic ignored \"-Winfinite-recursion\"")       \
 _Pragma("GCC diagnostic ignored \"-Wunused-but-set-parameter\"") \
 _Pragma("GCC diagnostic ignored \"-Wnested-anon-types\"")        \
diff --git a/include/deal.II/base/std_cxx11/thread.h b/include/deal.II/base/std_cxx11/thread.h
index 29a8278149..9a754c4fcf 100644
--- a/include/deal.II/base/std_cxx11/thread.h
+++ b/include/deal.II/base/std_cxx11/thread.h
@@ -31,7 +31,10 @@ DEAL_II_NAMESPACE_CLOSE
 
 #else
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <boost/thread.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 DEAL_II_NAMESPACE_OPEN
 namespace std_cxx11
 {
diff --git a/source/base/polynomials_bernstein.cc b/source/base/polynomials_bernstein.cc
index 1cb8c56834..fedd18180a 100644
--- a/source/base/polynomials_bernstein.cc
+++ b/source/base/polynomials_bernstein.cc
@@ -1,6 +1,23 @@
+// ---------------------------------------------------------------------
+//
+// Copyright (C) 2004 - 2015 by the deal.II authors
+//
+// This file is part of the deal.II library.
+//
+// The deal.II library is free software; you can use it, redistribute
+// it, and/or modify it under the terms of the GNU Lesser General
+// Public License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// The full text of the license can be found in the file LICENSE at
+// the top level of the deal.II distribution.
+//
+// ---------------------------------------------------------------------
+
 #include <deal.II/base/polynomials_bernstein.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/math/special_functions/binomial.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <vector>
 
diff --git a/source/base/utilities.cc b/source/base/utilities.cc
index 1e07737018..a8a9fe914a 100644
--- a/source/base/utilities.cc
+++ b/source/base/utilities.cc
@@ -18,9 +18,9 @@
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/thread_local_storage.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/math/special_functions/erf.hpp>
 #include <boost/lexical_cast.hpp>
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/random.hpp>
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
diff --git a/source/lac/sparsity_tools.cc b/source/lac/sparsity_tools.cc
index 199751f7d8..a274d91e3e 100644
--- a/source/lac/sparsity_tools.cc
+++ b/source/lac/sparsity_tools.cc
@@ -30,10 +30,12 @@
 #endif
 
 #ifdef DEAL_II_WITH_METIS
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 extern "C"
 {
 #include <metis.h>
 }
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 
-- 
2.39.5