]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Work around a problem in icc7 that complained at the definition of the
authordeal <deal@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 24 Mar 2005 20:26:55 +0000 (20:26 +0000)
committerdeal <deal@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 24 Mar 2005 20:26:55 +0000 (20:26 +0000)
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

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

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

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.