From: Timo Heister <timo.heister@gmail.com>
Date: Thu, 10 Aug 2017 23:06:02 +0000 (-0600)
Subject: trilinos as system includes, guard warnings
X-Git-Tag: v9.0.0-rc1~1301^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4779%2Fhead;p=dealii.git

trilinos as system includes, guard warnings
---

diff --git a/include/deal.II/base/sacado_product_type.h b/include/deal.II/base/sacado_product_type.h
index abd7ad1652..f2e3a63b01 100644
--- a/include/deal.II/base/sacado_product_type.h
+++ b/include/deal.II/base/sacado_product_type.h
@@ -22,7 +22,10 @@
 #include <deal.II/base/template_constraints.h>
 
 #ifdef DEAL_II_WITH_TRILINOS
-#include "Sacado.hpp"
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#  include <Sacado.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 
diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h
index 9a4ae1eef8..a4f342678d 100644
--- a/include/deal.II/lac/read_write_vector.h
+++ b/include/deal.II/lac/read_write_vector.h
@@ -32,7 +32,11 @@
 #ifdef DEAL_II_WITH_TRILINOS
 #include <deal.II/lac/trilinos_epetra_communication_pattern.h>
 #include <deal.II/lac/trilinos_epetra_vector.h>
-#include "Epetra_MultiVector.h"
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#  include <Epetra_MultiVector.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 #endif
 
 DEAL_II_NAMESPACE_OPEN
diff --git a/include/deal.II/lac/read_write_vector.templates.h b/include/deal.II/lac/read_write_vector.templates.h
index 7371ad215e..d493e76cf7 100644
--- a/include/deal.II/lac/read_write_vector.templates.h
+++ b/include/deal.II/lac/read_write_vector.templates.h
@@ -33,7 +33,9 @@
 #  include <deal.II/lac/trilinos_vector.h>
 #  include <deal.II/lac/trilinos_epetra_vector.h>
 #  include <deal.II/lac/trilinos_epetra_communication_pattern.h>
-#  include "Epetra_Import.h"
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#  include <Epetra_Import.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 #ifdef DEAL_II_WITH_CUDA
diff --git a/include/deal.II/lac/trilinos_epetra_communication_pattern.h b/include/deal.II/lac/trilinos_epetra_communication_pattern.h
index fd10b105bf..e870cb03b7 100644
--- a/include/deal.II/lac/trilinos_epetra_communication_pattern.h
+++ b/include/deal.II/lac/trilinos_epetra_communication_pattern.h
@@ -24,7 +24,11 @@
 #ifdef DEAL_II_WITH_MPI
 
 #include <deal.II/lac/communication_pattern_base.h>
-#include "Epetra_Import.h"
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#  include <Epetra_Import.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 #include <memory>
 
 DEAL_II_NAMESPACE_OPEN
diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h
index 7cc4ab4c8f..fc12eea2fe 100644
--- a/include/deal.II/lac/trilinos_epetra_vector.h
+++ b/include/deal.II/lac/trilinos_epetra_vector.h
@@ -26,8 +26,11 @@
 #include <deal.II/lac/trilinos_epetra_communication_pattern.h>
 #include <deal.II/lac/vector_space_vector.h>
 #include <memory>
-#include "mpi.h"
-#include "Epetra_FEVector.h"
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#  include <mpi.h>
+#  include <Epetra_FEVector.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 
diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h
index 8c90ee992b..efe7a2c901 100644
--- a/include/deal.II/lac/trilinos_sparse_matrix.h
+++ b/include/deal.II/lac/trilinos_sparse_matrix.h
@@ -44,7 +44,7 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Comm.h>
 #  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
-#    include "mpi.h"
+#    include <mpi.h>
 #  else
 #    include <Epetra_SerialComm.h>
 #  endif
diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h
index 476f4ed144..47b4afc94e 100644
--- a/include/deal.II/lac/trilinos_sparsity_pattern.h
+++ b/include/deal.II/lac/trilinos_sparsity_pattern.h
@@ -35,9 +35,9 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Map.h>
 #  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
-#    include "mpi.h"
+#    include <mpi.h>
 #  else
-#    include "Epetra_SerialComm.h"
+#    include <Epetra_SerialComm.h>
 #  endif
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h
index 39f420bbdb..ffd669cd90 100644
--- a/include/deal.II/lac/trilinos_vector.h
+++ b/include/deal.II/lac/trilinos_vector.h
@@ -33,16 +33,16 @@
 #  include <memory>
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
-#  include "Epetra_ConfigDefs.h"
+#  include <Epetra_ConfigDefs.h>
 #  ifdef DEAL_II_WITH_MPI // only if MPI is installed
-#    include "mpi.h"
-#    include "Epetra_MpiComm.h"
+#    include <mpi.h>
+#    include <Epetra_MpiComm.h>
 #  else
-#    include "Epetra_SerialComm.h"
+#    include <Epetra_SerialComm.h>
 #  endif
-#  include "Epetra_FEVector.h"
-#  include "Epetra_Map.h"
-#  include "Epetra_LocalMap.h"
+#  include <Epetra_FEVector.h>
+#  include <Epetra_Map.h>
+#  include <Epetra_LocalMap.h>
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
diff --git a/source/base/symmetric_tensor.cc b/source/base/symmetric_tensor.cc
index 7984a2fb12..ac21457526 100644
--- a/source/base/symmetric_tensor.cc
+++ b/source/base/symmetric_tensor.cc
@@ -17,7 +17,11 @@
 
 // Required for instantiation of template functions
 #ifdef DEAL_II_WITH_TRILINOS
-#include "Sacado.hpp"
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#  include <Sacado.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 #include <deal.II/base/sacado_product_type.h>
 #endif
 
diff --git a/source/base/utilities.cc b/source/base/utilities.cc
index b4dfb30990..9ca6a6e48d 100644
--- a/source/base/utilities.cc
+++ b/source/base/utilities.cc
@@ -63,8 +63,8 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #    include <deal.II/lac/trilinos_vector.h>
 #    include <deal.II/lac/trilinos_parallel_block_vector.h>
 #  endif
-#  include "Teuchos_RCP.hpp"
-#  include "Epetra_SerialComm.h"
+#  include <Teuchos_RCP.hpp>
+#  include <Epetra_SerialComm.h>
 #endif
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
diff --git a/source/lac/trilinos_epetra_communication_pattern.cc b/source/lac/trilinos_epetra_communication_pattern.cc
index 1c687aaf7a..63ca267c2f 100644
--- a/source/lac/trilinos_epetra_communication_pattern.cc
+++ b/source/lac/trilinos_epetra_communication_pattern.cc
@@ -20,7 +20,11 @@
 #ifdef DEAL_II_WITH_MPI
 
 #include <deal.II/base/index_set.h>
-#include "Epetra_Map.h"
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#  include <Epetra_Map.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 #include <memory>
 
 DEAL_II_NAMESPACE_OPEN
diff --git a/source/lac/trilinos_epetra_vector.cc b/source/lac/trilinos_epetra_vector.cc
index 53476c7bf6..c6a0984c57 100644
--- a/source/lac/trilinos_epetra_vector.cc
+++ b/source/lac/trilinos_epetra_vector.cc
@@ -24,9 +24,12 @@
 #include <boost/io/ios_state.hpp>
 
 #include <deal.II/lac/read_write_vector.h>
-#include "Epetra_Import.h"
-#include "Epetra_Map.h"
-#include "Epetra_MpiComm.h"
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#  include <Epetra_Import.h>
+#  include <Epetra_Map.h>
+#  include <Epetra_MpiComm.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 DEAL_II_NAMESPACE_OPEN