From: guido Date: Mon, 15 Jul 2002 13:49:33 +0000 (+0000) Subject: File can be compiled now X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dde395b7ed45fbd3ca1a7837edb5c805752c357c;p=dealii-svn.git File can be compiled now git-svn-id: https://svn.dealii.org/trunk@6245 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/sparse_matrix_ez.h b/deal.II/lac/include/lac/sparse_matrix_ez.h index f0b8a36fec..f8d5eaf340 100644 --- a/deal.II/lac/include/lac/sparse_matrix_ez.h +++ b/deal.II/lac/include/lac/sparse_matrix_ez.h @@ -19,6 +19,8 @@ #include #include +#include + template class Vector; template class FullMatrix; @@ -63,7 +65,7 @@ class SparseMatrixEZ : public Subscriptor * matrix, you can do so by using the * @p{copy_from} function. */ - SparseMatrixEZ (const SparseMatrix &); + SparseMatrixEZ (const SparseMatrixEZ &); /** * Constructor. Generates a @@ -712,7 +714,7 @@ class SparseMatrixEZ : public Subscriptor /* * Access to value. */ -// number& operator() (unsigned int column); + number& operator() (unsigned int column); /** * Read-only access to value. @@ -727,22 +729,22 @@ class SparseMatrixEZ : public Subscriptor /** * Start of entry list. */ - std::vector::iterator begin(); + typename std::vector::iterator begin(); /** * Start of constant entry list. */ - std::vector::const_iterator begin() const; + typename std::vector::const_iterator begin() const; /** * End of entry list. */ - std::vector::iterator end(); + typename std::vector::iterator end(); /** * End of constant entry list. */ - std::vector::const_iterator end() const; + typename std::vector::const_iterator end() const; private: @@ -752,7 +754,7 @@ class SparseMatrixEZ : public Subscriptor * entries of a row ordered * by column number. */ - std::vector values; + typename std::vector values; }; @@ -910,7 +912,7 @@ SparseMatrixEZ::Row::operator()(unsigned int column) template inline -std::vector::iterator +typename std::vector::Entry>::iterator SparseMatrixEZ::Row::begin() { return values.begin(); @@ -928,7 +930,7 @@ SparseMatrixEZ::Row::size() const template inline -std::vector::const_iterator +typename std::vector::Entry>::const_iterator SparseMatrixEZ::Row::begin() const { return values.begin(); @@ -937,7 +939,7 @@ SparseMatrixEZ::Row::begin() const template inline -std::vector::iterator +typename std::vector::Entry>::iterator SparseMatrixEZ::Row::end() { return values.end(); @@ -946,7 +948,7 @@ SparseMatrixEZ::Row::end() template inline -std::vector::const_iterator +typename std::vector::Entry>::const_iterator SparseMatrixEZ::Row::end() const { return values.end();