From be0e3d19a5a434170f71e04f95f058119f68913b Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Thu, 30 Jun 2005 12:38:04 +0000
Subject: [PATCH] Removed comparisons between unsigned and signed integers.
[[Imported from SVN: r283]]
---
istl/paamg/graph.hh | 2 +-
istl/paamg/indicescoarsener.hh | 2 +-
istl/paamg/test/galerkintest.cc | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/istl/paamg/graph.hh b/istl/paamg/graph.hh
index f5bd2e31d..37faae4c5 100644
--- a/istl/paamg/graph.hh
+++ b/istl/paamg/graph.hh
@@ -68,7 +68,7 @@ namespace Dune
*
* Each descriptor describes exactly one vertex.
*/
- typedef std::size_t VertexDescriptor;
+ typedef typename M::size_type VertexDescriptor;
/**
* @brief The edge descriptor.
diff --git a/istl/paamg/indicescoarsener.hh b/istl/paamg/indicescoarsener.hh
index 6714b653e..2a45c9429 100644
--- a/istl/paamg/indicescoarsener.hh
+++ b/istl/paamg/indicescoarsener.hh
@@ -250,7 +250,7 @@ namespace Dune
index != riEnd; ++index) {
if(!E::contains(index->localIndexPair().local().attribute()))
{
- assert(aggregates[index->localIndexPair().local()]<attributes.size());
+ assert(aggregates[index->localIndexPair().local()]<(int)attributes.size());
assert(attributes[aggregates[index->localIndexPair().local()]] == std::numeric_limits<char>::max()
|| attributes[aggregates[index->localIndexPair().local()]] == index->attribute());
attributes[aggregates[index->localIndexPair().local()]] = index->attribute();
diff --git a/istl/paamg/test/galerkintest.cc b/istl/paamg/test/galerkintest.cc
index 6ab049d7a..e264731f3 100644
--- a/istl/paamg/test/galerkintest.cc
+++ b/istl/paamg/test/galerkintest.cc
@@ -188,7 +188,7 @@ public:
{
const T& aggregate = aggregates_[index];
const Dune::IndexPair<TG,Dune::ParallelLocalIndex<TA> >& pair = indexset_.pair(aggregate);
- assert(pair.local()==aggregate);
+ assert(aggregate>=0 && pair.local()==static_cast<size_t>(aggregate));
assert(pair.local().attribute()==owner);
return pair.global();
}
@@ -332,7 +332,7 @@ void testCoarsenIndices()
assert(N*N==mg.maxVertex());
bool visitedIterator[N*N];
- for(std::size_t i=0; i < mg.maxVertex(); ++i)
+ for(Vertex i=0; i < mg.maxVertex(); ++i)
visitedIterator[i]=false;
VisitedMap2 visitedMap2(visitedIterator, Dune::IdentityMap());
--
GitLab