From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Fri, 25 Mar 2005 16:10:25 +0000 (+0000)
Subject: Undo last checkin, since it makes other compilers fail.
X-Git-Tag: v8.0.0~14305
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18945456592633c38f75e4165d36fb6e8d1fbfca;p=dealii.git

Undo last checkin, since it makes other compilers fail.


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

diff --git a/deal.II/lac/include/lac/block_matrix_array.h b/deal.II/lac/include/lac/block_matrix_array.h
index 8696e15979..6f9fd4211d 100644
--- a/deal.II/lac/include/lac/block_matrix_array.h
+++ b/deal.II/lac/include/lac/block_matrix_array.h
@@ -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