Provide forward declarations. Re-indent a couple of places.

git-svn-id: https://svn.dealii.org/trunk@19191 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/lac/include/lac/petsc_matrix_base.h b/deal.II/lac/include/lac/petsc_matrix_base.h
index 786773dbeff4ec76466587f281049dc22926d048..019c6544f3c3dec394b8a17a9891c698aa7e4e43 100644 (file)
--- a/deal.II/lac/include/lac/petsc_matrix_base.h
+++ b/deal.II/lac/include/lac/petsc_matrix_base.h
@@ -28,6 +28,8 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+template <typename Matrix> class BlockMatrixBase;
+
 
 namespace PETScWrappers
 {
@@ -1221,11 +1223,11 @@ namespace PETScWrappers
 
 
                                       /**
-                                       *  To allow calling protected prepare_add()
-                                       *  and prepare_set().
+                                       *  To allow calling protected
+                                       *  prepare_add() and
+                                       *  prepare_set().
                                        */ 
       template <class> friend class BlockMatrixBase;
-
   };
 
 

diff --git a/deal.II/lac/include/lac/petsc_parallel_sparse_matrix.h b/deal.II/lac/include/lac/petsc_parallel_sparse_matrix.h
index a60e9c9bad949c85b126a45f68b1c2f5e6ccab9c..38128e8440517c0ca8eee47bc9eb9064015c053c 100644 (file)
--- a/deal.II/lac/include/lac/petsc_parallel_sparse_matrix.h
+++ b/deal.II/lac/include/lac/petsc_parallel_sparse_matrix.h
@@ -27,8 +27,7 @@ DEAL_II_NAMESPACE_OPEN
 
 
                                  // forward declaration
-template <typename MatrixType>
-class BlockMatrixBase;
+template <typename Matrix> class BlockMatrixBase;
 
 
 namespace PETScWrappers
@@ -429,8 +428,9 @@ namespace PETScWrappers
                         const bool                       preset_nonzero_locations);
 
                                       /**
-                                       *  To allow calling protected prepare_add()
-                                       *  and prepare_set().
+                                       *  To allow calling protected
+                                       *  prepare_add() and
+                                       *  prepare_set().
                                        */  
        friend class BlockMatrixBase<SparseMatrix>;
     };

diff --git a/deal.II/lac/include/lac/petsc_sparse_matrix.h b/deal.II/lac/include/lac/petsc_sparse_matrix.h
index 37d3b79e179a30020a7d838ca963a28eb1fc577e..2c0eabfeb27fb7ad3d3bdf1bf71caa207aabc4ec 100644 (file)
--- a/deal.II/lac/include/lac/petsc_sparse_matrix.h
+++ b/deal.II/lac/include/lac/petsc_sparse_matrix.h
@@ -24,8 +24,7 @@
 
 DEAL_II_NAMESPACE_OPEN
                                  // forward declaration
-template <typename MatrixType>
-class BlockMatrixBase;
+template <typename MatrixType> class BlockMatrixBase;
 
 
 namespace PETScWrappers
@@ -323,10 +322,11 @@ namespace PETScWrappers
                       const bool          preset_nonzero_locations);
                       
                                       /**
-                                       *  To allow calling protected prepare_add()
-                                       *  and prepare_set().
+                                       *  To allow calling protected
+                                       *  prepare_add() and
+                                       *  prepare_set().
                                        */                       
-         friend class BlockMatrixBase<SparseMatrix>;
+      friend class BlockMatrixBase<SparseMatrix>;
   };
 }
 

diff --git a/deal.II/lac/include/lac/trilinos_sparse_matrix.h b/deal.II/lac/include/lac/trilinos_sparse_matrix.h
index 9a220c1072f7caa50e549072f973d79b40ee5f0e..a288fa6fb0fa13f661df8a2e334d9050a2864b50 100755 (executable)
--- a/deal.II/lac/include/lac/trilinos_sparse_matrix.h
+++ b/deal.II/lac/include/lac/trilinos_sparse_matrix.h
@@ -41,8 +41,7 @@
 DEAL_II_NAMESPACE_OPEN
 
                                 // forward declarations
-template <typename MatrixType>
-class BlockMatrixBase;
+template <typename MatrixType> class BlockMatrixBase;
 
 template <typename number> class SparseMatrix;
 
@@ -2004,10 +2003,11 @@ namespace TrilinosWrappers
       std::auto_ptr<Epetra_FECrsMatrix> matrix;
 
                                       /**
-                                       *  To allow calling protected prepare_add()
-                                       *  and prepare_set().
+                                       *  To allow calling protected
+                                       *  prepare_add() and
+                                       *  prepare_set().
                                        */ 
-         friend class BlockMatrixBase<SparseMatrix>;
+      friend class BlockMatrixBase<SparseMatrix>;
   };