diff -r 096d83158d41 -r 81b47fc5c444 lemon/bits/debug_map.h
--- a/lemon/bits/debug_map.h	Fri Mar 02 17:56:22 2007 +0000
+++ b/lemon/bits/debug_map.h	Fri Mar 02 18:04:28 2007 +0000
@@ -165,7 +165,7 @@
           flag[Parent::notifier()->id(it)] = false;
         }
       }
-      for (int i = 0; i < (int)flag.size(); ++i) {
+      for (int i = 0; i < int(flag.size()); ++i) {
         LEMON_ASSERT(!flag[i], MapError());
       }
     }
@@ -235,7 +235,7 @@
     /// and it overrides the add() member function of the observer base.     
     virtual void add(const Key& key) {
       int id = Parent::notifier()->id(key);
-      if (id >= (int)container.size()) {
+      if (id >= int(container.size())) {
 	container.resize(id + 1);
         flag.resize(id + 1, false);
       }
@@ -246,8 +246,8 @@
         const typename Parent::Notifier* notifier = Parent::notifier();
         Item it;
         for (notifier->first(it); it != INVALID; notifier->next(it)) {
-          int id = Parent::notifier()->id(it);
-          fl[id] = true;
+          int jd = Parent::notifier()->id(it);
+          fl[jd] = true;
         }
         LEMON_ASSERT(fl == flag, MapError());
       }
@@ -259,7 +259,7 @@
     /// and it overrides the add() member function of the observer base.     
     virtual void add(const std::vector<Key>& keys) {
       int max = container.size() - 1;
-      for (int i = 0; i < (int)keys.size(); ++i) {
+      for (int i = 0; i < int(keys.size()); ++i) {
         int id = Parent::notifier()->id(keys[i]);
         if (id >= max) {
           max = id;
@@ -267,7 +267,7 @@
       }
       container.resize(max + 1);
       flag.resize(max + 1, false);
-      for (int i = 0; i < (int)keys.size(); ++i) {
+      for (int i = 0; i < int(keys.size()); ++i) {
         LEMON_ASSERT(!flag[Parent::notifier()->id(keys[i])], MapError());
         flag[Parent::notifier()->id(keys[i])] = true;
       }
@@ -318,7 +318,7 @@
         }
         LEMON_ASSERT(fl == flag, MapError());
       }
-      for (int i = 0; i < (int)keys.size(); ++i) {
+      for (int i = 0; i < int(keys.size()); ++i) {
 	container[Parent::notifier()->id(keys[i])] = Value();
         LEMON_ASSERT(flag[Parent::notifier()->id(keys[i])], MapError());
         flag[Parent::notifier()->id(keys[i])] = false;
@@ -331,7 +331,7 @@
     /// and it overrides the build() member function of the observer base.
     virtual void build() { 
       if (strictCheck) {
-        for (int i = 0; i < (int)flag.size(); ++i) {
+        for (int i = 0; i < int(flag.size()); ++i) {
           LEMON_ASSERT(flag[i], MapError());
         }
       }
@@ -362,7 +362,7 @@
         flag[id] = false;
       }
       if (strictCheck) {
-        for (int i = 0; i < (int)flag.size(); ++i) {
+        for (int i = 0; i < int(flag.size()); ++i) {
           LEMON_ASSERT(!flag[i], MapError());
         }
       }