From: wolf Date: Mon, 15 Mar 2004 22:51:14 +0000 (+0000) Subject: Purge the use of short ints. Noone knows how many entries we are going to store in... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee1cf73912fdc9bb2f799117cfacb422276997ea;p=dealii-svn.git Purge the use of short ints. Noone knows how many entries we are going to store in a row. git-svn-id: https://svn.dealii.org/trunk@8752 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/sparse_matrix.h b/deal.II/lac/include/lac/sparse_matrix.h index 5435afed0b..bd712a70a1 100644 --- a/deal.II/lac/include/lac/sparse_matrix.h +++ b/deal.II/lac/include/lac/sparse_matrix.h @@ -58,7 +58,7 @@ class SparseMatrix : public virtual Subscriptor */ Accessor (const SparseMatrix *matrix, const unsigned int row, - const unsigned short index); + const unsigned int index); /** * Row number of the element @@ -72,7 +72,7 @@ class SparseMatrix : public virtual Subscriptor * represented by this * object. */ - unsigned short index() const; + unsigned int index() const; /** * Column number of the @@ -100,7 +100,7 @@ class SparseMatrix : public virtual Subscriptor /** * Current index in row. */ - unsigned short a_index; + unsigned int a_index; /** * Make enclosing class a @@ -117,7 +117,7 @@ class SparseMatrix : public virtual Subscriptor */ const_iterator (const SparseMatrix *matrix, const unsigned int row, - const unsigned short index); + const unsigned int index); /** * Prefix increment. @@ -1512,7 +1512,7 @@ inline SparseMatrix::const_iterator::Accessor:: Accessor (const SparseMatrix* matrix, const unsigned int r, - const unsigned short i) + const unsigned int i) : matrix(matrix), a_row(r), @@ -1541,7 +1541,7 @@ SparseMatrix::const_iterator::Accessor::column() const template inline -unsigned short +unsigned int SparseMatrix::const_iterator::Accessor::index() const { return a_index; @@ -1563,7 +1563,7 @@ inline SparseMatrix::const_iterator:: const_iterator(const SparseMatrix *matrix, const unsigned int r, - const unsigned short i) + const unsigned int i) : accessor(matrix, r, i) {}