From 4f89112d4eede32f438c12fa2c36363de5dd3181 Mon Sep 17 00:00:00 2001
From: Uli Sack <usack@math.fu-berlin.de>
Date: Tue, 17 Apr 2012 14:51:54 +0000
Subject: [PATCH] use size_t; remove unused variable }-> get rid of warnings
[[Imported from SVN: r5996]]
---
dune/fufem/functionspacebases/dofconstraints.hh | 2 --
dune/fufem/functionspacebases/extensionbasis.hh | 8 ++++----
dune/fufem/functionspacebases/reducedconformingbasis.hh | 4 ++--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dune/fufem/functionspacebases/dofconstraints.hh b/dune/fufem/functionspacebases/dofconstraints.hh
index 8d2f22b3..c48fc430 100644
--- a/dune/fufem/functionspacebases/dofconstraints.hh
+++ b/dune/fufem/functionspacebases/dofconstraints.hh
@@ -85,8 +85,6 @@ class DOFConstraints {
template<class B>
void setupFromBasis(const B& basis)
{
- static const int dim = B::GridView::Grid::dimension;
-
typedef typename B::GridView::template Codim<0>::Entity Element;
typedef typename B::GridView::template Codim<0>::Iterator ElementIterator;
typedef typename B::GridView::IntersectionIterator NeighborIterator;
diff --git a/dune/fufem/functionspacebases/extensionbasis.hh b/dune/fufem/functionspacebases/extensionbasis.hh
index f8af04b2..7d1986e7 100644
--- a/dune/fufem/functionspacebases/extensionbasis.hh
+++ b/dune/fufem/functionspacebases/extensionbasis.hh
@@ -103,7 +103,7 @@ class ExtensionBasis :
SpaceExtensionSetup<Basis, ExtendedBasis>::setup(basis_, extendedBasis_, *this);
dofConstraints_.resize(extendedBasis_.size());
- for(int i=0; i<extendedBasis_.size(); ++i)
+ for (size_t i=0; i<extendedBasis_.size(); ++i)
{
if (isExtensionDOF_[i][0])
dofConstraints_.isConstrained()[i][0] = false;
@@ -113,7 +113,7 @@ class ExtensionBasis :
if (extendedBasis_.isConstrained(i))
{
const LinearCombination& constraints = extendedBasis_.constraints(i);
- for(int j=0; j<constraints.size(); ++j)
+ for (size_t j=0; j<constraints.size(); ++j)
{
if (isExtensionDOF_[constraints[j].index][0])
dofConstraints_.interpolation()[i].push_back(constraints[j]);
@@ -155,8 +155,8 @@ struct ExtensionFirstSpaceExtensionSetup
static void setup(const Basis& basis, const ExtendedBasis& extendedBasis, EB& extension)
{
extension.isExtensionDOF().resize(extendedBasis.size());
- int extensionSize = extendedBasis.size() - basis.size();
- for(int i=0; i<extendedBasis.size(); ++i)
+ size_t extensionSize = extendedBasis.size() - basis.size();
+ for (size_t i=0; i<extendedBasis.size(); ++i)
extension.isExtensionDOF()[i] = ((i<extensionSize) and not(extendedBasis.isConstrained(i)));
}
};
diff --git a/dune/fufem/functionspacebases/reducedconformingbasis.hh b/dune/fufem/functionspacebases/reducedconformingbasis.hh
index 0d3829ce..127951b3 100644
--- a/dune/fufem/functionspacebases/reducedconformingbasis.hh
+++ b/dune/fufem/functionspacebases/reducedconformingbasis.hh
@@ -141,9 +141,9 @@ class ReducedConformingBasis :
reorderedIndex_[lastUnconstrained] = lastUnconstrained;
}
}
- for(int i=firstConstrained; i<ncBasis_.size(); ++i)
+ for (size_t i=firstConstrained; i<ncBasis_.size(); ++i)
{
- for (int j=0; j<interpolation[i].size(); ++j)
+ for (size_t j=0; j<interpolation[i].size(); ++j)
interpolation[i][j].index = reorderedIndex_[interpolation[i][j].index];
}
unconstrainedSize_ = firstConstrained;
--
GitLab