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 abd7ad165231192f65a8d35879231bcea23500fc..f2e3a63b017d926c0c4a72981c71857ad3e75cf5 100644 (file)
--- 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 9a4ae1eef86d70093a2ead933f17c3483a70a3cf..a4f342678d37afaed8b955cf66162a9a6d2738da 100644 (file)
--- 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 7371ad215eaf5b91dfa917b29f0d1440f5945da9..d493e76cf76d4a9d6c861d20d0587fc56e43c4a5 100644 (file)
--- 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 fd10b105bf692ab098134d0b600672d5f540916c..e870cb03b71c7ec525b3af793c87390c696197cb 100644 (file)
--- 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 7cc4ab4c8fbcda9c6ba3181e7efad7749ce5ad05..fc12eea2fe83ed15cf418a42aed89443f1999cb0 100644 (file)
--- 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 8c90ee992b86c7a56784a990480f409448b90d9e..efe7a2c901676044d46ac1447f1b221be5b7548e 100644 (file)
--- 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 476f4ed14444a53a3cdac9d9784d56bb3ac91b86..47b4afc94e15f7affab75735ec594d8785cb0ef4 100644 (file)
--- 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 39f420bbdb92e62dd5f020ddac66fe10cca9a95d..ffd669cd903b6c585ecb8d552b9a8799eec7e823 100644 (file)
--- 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 7984a2fb12c9380d148693bda6d633a69c382adc..ac21457526d9c60fd112e929efb5e1ca41801784 100644 (file)
--- 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 b4dfb3099064bf8f040147a0ea6a3695165d70e3..9ca6a6e48d93b8535479e5c6cc6c263016146649 100644 (file)
--- 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 1c687aaf7a7e35168309ba6dabfd4009b6692853..63ca267c2f15c3c09c355677b03d69a36a717493 100644 (file)
--- 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 53476c7bf668afbb2d527fe84d9ad4eb35cb8893..c6a0984c5707e033ec477a00e522ba02e01367a4 100644 (file)
--- 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