From 5ff8460d1dc0eeda7a38e716f5e8f29415246366 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 10 Feb 2010 20:56:10 +0000
Subject: [PATCH] avoid various warnings
[[Imported from SVN: r3229]]
---
dune/solvers/iterationsteps/blockgsstep.cc | 2 +-
dune/solvers/iterationsteps/projectedblockgsstep.cc | 2 +-
dune/solvers/iterationsteps/trustregiongsstep.cc | 4 ++--
dune/solvers/iterationsteps/trustregiongsstep.hh | 2 +-
dune/solvers/solvers/loopsolver.cc | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dune/solvers/iterationsteps/blockgsstep.cc b/dune/solvers/iterationsteps/blockgsstep.cc
index 18c119d9..c8132c51 100644
--- a/dune/solvers/iterationsteps/blockgsstep.cc
+++ b/dune/solvers/iterationsteps/blockgsstep.cc
@@ -38,7 +38,7 @@ void BlockGSStep<OperatorType, DiscFuncType, BitVectorType>::iterate()
{
const OperatorType& mat = *this->mat_;
- for (int i=0; i<this->x_->size(); i++) {
+ for (size_t i=0; i<this->x_->size(); i++) {
/** \todo Handle more general boundary conditions */
if ((*this->ignoreNodes_)[i][0]) {
diff --git a/dune/solvers/iterationsteps/projectedblockgsstep.cc b/dune/solvers/iterationsteps/projectedblockgsstep.cc
index 30902ed0..6ac1b031 100644
--- a/dune/solvers/iterationsteps/projectedblockgsstep.cc
+++ b/dune/solvers/iterationsteps/projectedblockgsstep.cc
@@ -15,7 +15,7 @@ void ProjectedBlockGSStep<OperatorType, DiscFuncType>::iterate()
const OperatorType& mat = *this->mat_;
- for (int i=0; i<this->x_->size(); i++) {
+ for (size_t i=0; i<this->x_->size(); i++) {
/** \todo Handle more general boundary conditions */
if ((*this->ignoreNodes_)[i][0])
diff --git a/dune/solvers/iterationsteps/trustregiongsstep.cc b/dune/solvers/iterationsteps/trustregiongsstep.cc
index f5b64e99..8e745da2 100644
--- a/dune/solvers/iterationsteps/trustregiongsstep.cc
+++ b/dune/solvers/iterationsteps/trustregiongsstep.cc
@@ -8,7 +8,7 @@ DiscFuncType TrustRegionGSStep<OperatorType, DiscFuncType>::getSol()
template<class OperatorType, class DiscFuncType>
inline
double TrustRegionGSStep<OperatorType, DiscFuncType>::
-residual(int index, int blockIndex) const
+residual(unsigned int index, int blockIndex) const
{
const OperatorType& mat = *this->mat_;
@@ -53,7 +53,7 @@ void TrustRegionGSStep<OperatorType, DiscFuncType>::iterate()
//std::cout << "----------------------------------\n";
//double oldEnergy = computeEnergy(mat, *this->x_, *this->rhs_);
- for (int i=0; i<this->x_->size(); i++) {
+ for (size_t i=0; i<this->x_->size(); i++) {
// scalar gauss-seidel
for (int j=0; j<blocksize; j++) {
diff --git a/dune/solvers/iterationsteps/trustregiongsstep.hh b/dune/solvers/iterationsteps/trustregiongsstep.hh
index 8ee78a78..df59a273 100644
--- a/dune/solvers/iterationsteps/trustregiongsstep.hh
+++ b/dune/solvers/iterationsteps/trustregiongsstep.hh
@@ -37,7 +37,7 @@
virtual DiscFuncType getSol();
- double residual(int index, int blockIndex) const;
+ double residual(unsigned int index, int blockIndex) const;
};
diff --git a/dune/solvers/solvers/loopsolver.cc b/dune/solvers/solvers/loopsolver.cc
index e927a573..b103b829 100644
--- a/dune/solvers/solvers/loopsolver.cc
+++ b/dune/solvers/solvers/loopsolver.cc
@@ -56,7 +56,7 @@ void ::LoopSolver<VectorType, BitVectorType>::solve()
std::cout << "---------------";
std::cout << "---------------";
std::cout << "---------";
- for(int i=0; i<header.size(); ++i)
+ for(size_t i=0; i<header.size(); ++i)
std::cout << "-";
std::cout << std::endl;
}
--
GitLab