]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Undo last checkin, since it makes other compilers fail.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 25 Mar 2005 16:10:25 +0000 (16:10 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 25 Mar 2005 16:10:25 +0000 (16:10 +0000)
git-svn-id: https://svn.dealii.org/trunk@10242 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/block_matrix_array.h

index 8696e15979b2ff650b424cec80823954cae4e90e..6f9fd4211d1afc75c0fbd669c5b8f0540c6dfbc8 100644 (file)
@@ -432,11 +432,14 @@ class BlockTrianglePrecondition
     void reinit(const unsigned int n_block_rows);
     
                                     /**
-                                     * Add a new block. Calls
-                                     * BlockMatrixArray::enter().
+                                     * Add a new block. Calls BlockMatrixArray::enter().
                                      */
-    using BlockMatrixArray<number>::enter;
-    
+    template <class MATRIX>
+    void enter (const MATRIX      &matrix,
+               const unsigned int row,
+               const unsigned int col,
+               const double       prefix = 1.,
+               const bool         transpose = false);
                                     /**
                                      * Preconditioning.
                                      */
@@ -633,6 +636,21 @@ BlockMatrixArray<number>::print_latex (STREAM& out) const
 }
 
 
+template <typename number>
+template <class MATRIX>
+inline
+void
+BlockTrianglePrecondition<number>::enter (
+  const MATRIX      &matrix,
+  const unsigned int row,
+  const unsigned int col,
+  const double       prefix,
+  const bool         transpose)
+{
+  BlockMatrixArray<number>::enter(matrix, row, col, prefix, transpose);
+}
+
+
 ///@endif
 
 #endif

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.