From 6f9d00ab2971baf3a0dcb66bbf3801ea19232fd8 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 21 Jul 2013 09:55:34 +0000
Subject: [PATCH] Fix warnings: signed/unsigned, init order
[[Imported from SVN: r11827]]
---
dune/solvers/solvers/cgsolver.cc | 2 +-
dune/solvers/solvers/tcgsolver.cc | 2 +-
dune/solvers/solvers/tcgsolver.hh | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dune/solvers/solvers/cgsolver.cc b/dune/solvers/solvers/cgsolver.cc
index 35ead789..1410a49a 100644
--- a/dune/solvers/solvers/cgsolver.cc
+++ b/dune/solvers/solvers/cgsolver.cc
@@ -43,7 +43,7 @@ void CGSolver<MatrixType, VectorType>::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;
}
diff --git a/dune/solvers/solvers/tcgsolver.cc b/dune/solvers/solvers/tcgsolver.cc
index f4ac5062..a24e1406 100644
--- a/dune/solvers/solvers/tcgsolver.cc
+++ b/dune/solvers/solvers/tcgsolver.cc
@@ -48,7 +48,7 @@ void TruncatedCGSolver<MatrixType, VectorType>::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;
}
diff --git a/dune/solvers/solvers/tcgsolver.hh b/dune/solvers/solvers/tcgsolver.hh
index 6fa7bc0e..69d0916b 100644
--- a/dune/solvers/solvers/tcgsolver.hh
+++ b/dune/solvers/solvers/tcgsolver.hh
@@ -69,8 +69,8 @@ public:
matrix_(matrix), x_(x), rhs_(rhs),
preconditioner_(preconditioner),
errorNorm_(errorNorm),
- trustRegionNormMatrix_(trustRegionNormMatrix),
- trustRegionRadius_(trustRegionRadius)
+ trustRegionRadius_(trustRegionRadius),
+ trustRegionNormMatrix_(trustRegionNormMatrix)
{}
/** \brief Constructor for repeated calls. The actual problem has to be provided separately */
--
GitLab