From: deal <deal@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 24 Mar 2005 20:26:55 +0000 (+0000)
Subject: Work around a problem in icc7 that complained at the definition of the
X-Git-Tag: v8.0.0~14307
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e26f4e316094df20f16dea4a6b182a5c061d0c;p=dealii.git

Work around a problem in icc7 that complained at the definition of the
enter() function that an inherited function can't be defined. This is,
of course, bogus...


git-svn-id: https://svn.dealii.org/trunk@10240 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 6f9fd4211d..8696e15979 100644
--- a/deal.II/lac/include/lac/block_matrix_array.h
+++ b/deal.II/lac/include/lac/block_matrix_array.h
@@ -432,14 +432,11 @@ class BlockTrianglePrecondition
     void reinit(const unsigned int n_block_rows);
     
 				     /**
-				      * Add a new block. Calls BlockMatrixArray::enter().
+				      * Add a new block. Calls
+				      * BlockMatrixArray::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);
+    using BlockMatrixArray<number>::enter;
+    
 				     /**
 				      * Preconditioning.
 				      */
@@ -636,21 +633,6 @@ 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