From 85d0da88bbcfa90864ad6172a973c7ed2bcd5caf Mon Sep 17 00:00:00 2001
From: Denis Davydov <davydden@gmail.com>
Date: Fri, 26 Feb 2016 19:40:08 +0100
Subject: [PATCH] consolidate definitions of TrilinosScalar in base/types.h as
 a typedef

---
 include/deal.II/base/types.h                       | 4 ++++
 include/deal.II/lac/trilinos_block_sparse_matrix.h | 2 --
 include/deal.II/lac/trilinos_sparse_matrix.h       | 2 --
 include/deal.II/lac/trilinos_vector_base.h         | 1 -
 include/deal.II/numerics/matrix_tools.h            | 3 ---
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/deal.II/base/types.h b/include/deal.II/base/types.h
index 7928db29f8..736b991995 100644
--- 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 7e7ce17176..174771aff8 100644
--- 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 279039cd13..4b0c73e64d 100644
--- 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 e2722eb9d9..6df31fb9ce 100644
--- 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 9c6b0ea26d..0b6e567d2a 100644
--- 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;
-- 
2.39.5