From 6a2d34b38a55c8b92bf56d392cd3e970e5ebc98b Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 3 Jun 2004 04:39:19 +0000 Subject: [PATCH] Various fixes for icc. git-svn-id: https://svn.dealii.org/trunk@9369 0785d39b-7218-0410-832d-ea1e28bc413d --- .../lac/block_sparse_matrix.templates.h | 4 +-- deal.II/lac/include/lac/block_vector.h | 6 ++-- .../lac/include/lac/block_vector.templates.h | 28 +++++++++---------- deal.II/lac/include/lac/block_vector_base.h | 1 + 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/deal.II/lac/include/lac/block_sparse_matrix.templates.h b/deal.II/lac/include/lac/block_sparse_matrix.templates.h index 7d0873d326..f602d1aff7 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/block_sparse_matrix.templates.h @@ -88,7 +88,7 @@ BlockSparseMatrix::operator = (const double d) for (unsigned int r=0; rn_block_rows(); ++r) for (unsigned int c=0; cn_block_cols(); ++c) - block(r,c) = d; + this->block(r,c) = d; return *this; } @@ -110,7 +110,7 @@ reinit (const BlockSparsityPattern &sparsity) this->sub_objects[r][c] = 0; delete p; } - sub_objects.reinit (0,0); + this->sub_objects.reinit (0,0); // then associate new sparsity // pattern and resize diff --git a/deal.II/lac/include/lac/block_vector.h b/deal.II/lac/include/lac/block_vector.h index 6c38c645e6..1b6646dd4b 100644 --- a/deal.II/lac/include/lac/block_vector.h +++ b/deal.II/lac/include/lac/block_vector.h @@ -390,7 +390,7 @@ BlockVector::BlockVector (const std::vector &n, { InputIterator end = start; std::advance (end, static_cast(n[b])); - std::copy (start, end, block(b).begin()); + std::copy (start, end, this->block(b).begin()); start = end; }; Assert (start == end, ExcIteratorRangeDoesNotMatchVectorSize()); @@ -434,8 +434,8 @@ BlockVector::operator = (const BlockVector &v) template void BlockVector::scale (const value_type factor) { - for (unsigned int i=0;in_blocks();++i) + this->components[i].scale(factor); } diff --git a/deal.II/lac/include/lac/block_vector.templates.h b/deal.II/lac/include/lac/block_vector.templates.h index 5013e26b4b..f371605a29 100644 --- a/deal.II/lac/include/lac/block_vector.templates.h +++ b/deal.II/lac/include/lac/block_vector.templates.h @@ -42,8 +42,8 @@ BlockVector::BlockVector (const BlockVector& v) : BlockVectorBase > () { - components.resize (v.num_blocks); - block_indices = v.block_indices; + this->components.resize (v.num_blocks); + this->block_indices = v.block_indices; num_blocks = v.num_blocks; for (unsigned int i=0; i void BlockVector::reinit (const std::vector &n, const bool fast) { - block_indices.reinit (n); - num_blocks = n.size(); - if (components.size() != num_blocks) - components.resize(num_blocks); + this->block_indices.reinit (n); + this->num_blocks = n.size(); + if (this->components.size() != num_blocks) + this->components.resize(num_blocks); - for (unsigned int i=0; inum_blocks; ++i) + this->components[i].reinit(n[i], fast); } @@ -92,13 +92,13 @@ template void BlockVector::reinit (const BlockVector& v, const bool fast) { - block_indices = v.get_block_indices(); - num_blocks = v.n_blocks(); - if (components.size() != num_blocks) - components.resize(num_blocks); + this->block_indices = v.get_block_indices(); + this->num_blocks = v.n_blocks(); + if (this->components.size() != num_blocks) + this->components.resize(num_blocks); - for (unsigned int i=0;inum_blocks;++i) + this->block(i).reinit(v.block(i), fast); } diff --git a/deal.II/lac/include/lac/block_vector_base.h b/deal.II/lac/include/lac/block_vector_base.h index 6eca3e5d28..570ca3c392 100644 --- a/deal.II/lac/include/lac/block_vector_base.h +++ b/deal.II/lac/include/lac/block_vector_base.h @@ -20,6 +20,7 @@ #include #include +#include -- 2.39.5