From: wolf Date: Tue, 3 Sep 2002 15:25:52 +0000 (+0000) Subject: Add a couple if missing std::'s X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=286dee9f6ed45a92ebf0d7b76d3e249c992ad79f;p=dealii-svn.git Add a couple if missing std::'s git-svn-id: https://svn.dealii.org/trunk@6347 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/block_matrix_array.h b/deal.II/lac/include/lac/block_matrix_array.h index d842431db8..d1260f3695 100644 --- a/deal.II/lac/include/lac/block_matrix_array.h +++ b/deal.II/lac/include/lac/block_matrix_array.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -191,7 +191,7 @@ class BlockMatrixArray : public Subscriptor * Array of block entries in the * matrix. */ - vector entries; + std::vector entries; private: /** @@ -384,8 +384,8 @@ BlockMatrixArray::vmult_add (BlockVector& dst, static Vector aux; - typename vector::const_iterator m = entries.begin(); - typename vector::const_iterator end = entries.end(); + typename std::vector::const_iterator m = entries.begin(); + typename std::vector::const_iterator end = entries.end(); for (; m != end ; ++m) { @@ -439,8 +439,8 @@ BlockMatrixArray::Tvmult_add (BlockVector& dst, Assert (src.n_blocks() == block_rows, ExcDimensionMismatch(src.n_blocks(), block_rows)); - typename vector::const_iterator m = entries.begin(); - typename vector::const_iterator end = entries.end(); + typename std::vector::const_iterator m = entries.begin(); + typename std::vector::const_iterator end = entries.end(); static Vector aux; @@ -509,24 +509,24 @@ void BlockMatrixArray::print_latex (ostream& out) const { out << "\\begin{array}{" - << string(n_block_cols(), 'c') + << std::string(n_block_cols(), 'c') << "}" << std::endl; - vector2d array(n_block_rows(), n_block_cols()); - typedef map NameMap; + Table<2,std::string> array(n_block_rows(), n_block_cols()); + typedef map NameMap; NameMap matrix_names; - typename vector::const_iterator m = entries.begin(); - typename vector::const_iterator end = entries.end(); + typename std::vector::const_iterator m = entries.begin(); + typename std::vector::const_iterator end = entries.end(); unsigned int matrix_number = 0; for (; m != end ; ++m) { if (matrix_names.find(m->matrix) == matrix_names.end()) { - pair x = + std::pair x = matrix_names.insert( - pair (m->matrix, string("M"))); + std::pair (m->matrix, std::string("M"))); STRINGSTREAM stream; stream << matrix_number++; stream << std::ends; @@ -574,9 +574,9 @@ BlockTrianglePrecondition::do_row ( { const typename BlockMatrixArray::Entry* diagonal = 0; - typename vector::Entry>::const_iterator + typename std::vector::Entry>::const_iterator m = entries.begin(); - typename vector::Entry>::const_iterator + typename std::vector::Entry>::const_iterator end = entries.end(); static Vector aux;