]> https://gitweb.dealii.org/ - dealii.git/commitdiff
The problem icc had was that the class both declared an enter() function, but
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 25 Mar 2005 16:30:41 +0000 (16:30 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 25 Mar 2005 16:30:41 +0000 (16:30 +0000)
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

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

index 6f9fd4211d1afc75c0fbd669c5b8f0540c6dfbc8..69f7bb9a896214160094f160583cdd0bed3951ea 100644 (file)
@@ -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

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.