consolidate definitions of TrilinosScalar in base/types.h as a typedef

diff --git a/include/deal.II/base/types.h b/include/deal.II/base/types.h
index 7928db29f898bbe32bb1fccc5dc191a6f3999d90..736b991995dc091f7dda13b77181fe23215619fe 100644 (file)
--- a/include/deal.II/base/types.h
+++ b/include/deal.II/base/types.h
@@ -130,6 +130,10 @@ namespace types
   typedef unsigned char material_id;
 }
 
+/**
+ * Declare type used in Epetra.
+ */
+typedef double TrilinosScalar;
 namespace TrilinosWrappers
 {
   namespace types

diff --git a/include/deal.II/lac/trilinos_block_sparse_matrix.h b/include/deal.II/lac/trilinos_block_sparse_matrix.h
index 7e7ce17176a7698ab7db79cc99c46dd04ecb28b1..174771aff88009a32c1098d9339825726ad7862e 100644 (file)
--- a/include/deal.II/lac/trilinos_block_sparse_matrix.h
+++ b/include/deal.II/lac/trilinos_block_sparse_matrix.h
@@ -31,8 +31,6 @@
 
 #  include <cmath>
 
-#  define TrilinosScalar double
-
 DEAL_II_NAMESPACE_OPEN
 
 // forward declarations

diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h
index 279039cd137eb83263a5641bbb188158987b7075..4b0c73e64d90a258d941e1dcd484ee95c27dcb63 100644 (file)
--- a/include/deal.II/lac/trilinos_sparse_matrix.h
+++ b/include/deal.II/lac/trilinos_sparse_matrix.h
@@ -33,8 +33,6 @@
 #  include <cmath>
 #  include <memory>
 
-#  define TrilinosScalar double
-
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_FECrsMatrix.h>
 #  include <Epetra_Map.h>

diff --git a/include/deal.II/lac/trilinos_vector_base.h b/include/deal.II/lac/trilinos_vector_base.h
index e2722eb9d97424d292c70a805f931ef62d58185f..6df31fb9ce641a1904ec513163ad898bae5694f3 100644 (file)
--- a/include/deal.II/lac/trilinos_vector_base.h
+++ b/include/deal.II/lac/trilinos_vector_base.h
@@ -32,7 +32,6 @@
 #  include <memory>
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
-#  define TrilinosScalar double
 #  include "Epetra_ConfigDefs.h"
 #  ifdef DEAL_II_WITH_MPI // only if MPI is installed
 #    include "mpi.h"

diff --git a/include/deal.II/numerics/matrix_tools.h b/include/deal.II/numerics/matrix_tools.h
index 9c6b0ea26d03418b0b9e30dca30705451786f6b5..0b6e567d2a4266796c7ff772b8d884a5379b49ca 100644 (file)
--- a/include/deal.II/numerics/matrix_tools.h
+++ b/include/deal.II/numerics/matrix_tools.h
@@ -70,9 +70,6 @@ namespace PETScWrappers
 #endif
 
 #ifdef DEAL_II_WITH_TRILINOS
-// TODO: move this to a stand-alone header and include from there?
-#  define TrilinosScalar double
-
 namespace TrilinosWrappers
 {
   class SparseMatrix;