change typedefs

git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@29766 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/lac/generic_linear_algebra.h b/deal.II/include/deal.II/lac/generic_linear_algebra.h
index 4efa3b7f8d369646cd02c7916efe285de5b8e4db..085c67a79ec7396667d1dd86aae21d14f360dde4 100644 (file)
--- a/deal.II/include/deal.II/lac/generic_linear_algebra.h
+++ b/deal.II/include/deal.II/lac/generic_linear_algebra.h
@@ -86,6 +86,8 @@ namespace LinearAlgebraPETSc
   typedef PETScWrappers::SparseMatrix SparseMatrix;
   typedef PETScWrappers::PreconditionSSOR PreconditionSSOR;
 
+  typedef PETScWrappers::SolverCG SolverCG;
+
 
   namespace MPI
   {
@@ -164,6 +166,8 @@ namespace LinearAlgebraTrilinos
 
   typedef TrilinosWrappers::Vector Vector;
 
+  typedef TrilinosWrappers::SolverCG SolverCG;
+
   namespace MPI
   {
 
@@ -215,7 +219,7 @@ namespace LinearAlgebraTrilinos
      */
     typedef TrilinosWrappers::PreconditionJacobi PreconditionJacobi;
 
-    typedef TrilinosWrappers::SolverCG SolverCG;
+
   }
 
 }