From e78becddb7d87dcc0c7ee4b7c0e8d5707417e81f Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Sat, 19 Jul 2003 21:01:31 +0000 Subject: [PATCH] one compiler did not like the other version git-svn-id: https://svn.dealii.org/trunk@7883 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/full_matrix.h | 28 ++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/deal.II/lac/include/lac/full_matrix.h b/deal.II/lac/include/lac/full_matrix.h index a2f7065c30..d2efd28310 100644 --- a/deal.II/lac/include/lac/full_matrix.h +++ b/deal.II/lac/include/lac/full_matrix.h @@ -68,13 +68,9 @@ template class FullMatrix : public Table<2,number> { public: + class const_iterator; + /** - * STL conforming iterator. - */ - class const_iterator - { - private: - /** * Accessor class for iterators */ class Accessor @@ -131,6 +127,12 @@ class FullMatrix : public Table<2,number> */ friend class const_iterator; }; + /** + * STL conforming iterator. + */ + class const_iterator + { + private: public: /** @@ -893,7 +895,7 @@ class FullMatrix : public Table<2,number> << "This function is not implemented for the given" << " matrix dimension " << arg1); - friend class const_iterator::Accessor; + friend class Accessor; }; /*@}*/ @@ -944,7 +946,7 @@ FullMatrix::copy_from (const MATRIX& M) template inline -FullMatrix::const_iterator::Accessor:: +FullMatrix::Accessor:: Accessor (const FullMatrix* matrix, const unsigned int r, const unsigned int c) @@ -958,7 +960,7 @@ Accessor (const FullMatrix* matrix, template inline unsigned int -FullMatrix::const_iterator::Accessor::row() const +FullMatrix::Accessor::row() const { return a_row; } @@ -967,7 +969,7 @@ FullMatrix::const_iterator::Accessor::row() const template inline unsigned int -FullMatrix::const_iterator::Accessor::column() const +FullMatrix::Accessor::column() const { return a_col; } @@ -976,7 +978,7 @@ FullMatrix::const_iterator::Accessor::column() const template inline number -FullMatrix::const_iterator::Accessor::value() const +FullMatrix::Accessor::value() const { return matrix->el(a_row, a_col); } @@ -1012,7 +1014,7 @@ FullMatrix::const_iterator::operator++ () template inline -const typename FullMatrix::const_iterator::Accessor & +const typename FullMatrix::Accessor & FullMatrix::const_iterator::operator* () const { return accessor; @@ -1021,7 +1023,7 @@ FullMatrix::const_iterator::operator* () const template inline -const typename FullMatrix::const_iterator::Accessor * +const typename FullMatrix::Accessor * FullMatrix::const_iterator::operator-> () const { return &accessor; -- 2.39.5