From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Fri, 25 Mar 2005 16:30:41 +0000 (+0000)
Subject: The problem icc had was that the class both declared an enter() function, but
X-Git-Tag: v8.0.0~14304
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2df3bdfc16c2cadda53ba54a7eeda6b71831da4;p=dealii.git

The problem icc had was that the class both declared an enter() function, but
then also made a function of the same signature visible in this class. My
initial attempt removed the function and replaced it with a using declaration,
which however in the sense of gcc conflicted with the other using declaration
(old vs new-style). Resolve this by only removing the new function -- it
called the old one anyway, and there already was a using declaration.


git-svn-id: https://svn.dealii.org/trunk@10243 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..69f7bb9a89 100644
--- a/deal.II/lac/include/lac/block_matrix_array.h
+++ b/deal.II/lac/include/lac/block_matrix_array.h
@@ -430,17 +430,8 @@ class BlockTrianglePrecondition
 				      * size and clear all blocks.
 				      */
     void reinit(const unsigned int n_block_rows);
-    
-				     /**
-				      * 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);
-				     /**
+
+                                     /**
 				      * Preconditioning.
 				      */
     void vmult (BlockVector<number>& dst,
@@ -636,21 +627,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