Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/bits/debug_map.h

Timestamp:

03/02/07 19:04:28 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3217

Message:

Hard Warning checking

• based on the remark of the ZIB user
• we do not use -Winline

File:

• lemon/bits/debug_map.h (modified) (8 diffs)

lemon/bits/debug_map.h

@@ -166 +166 @@
         }
       }
-      for (int i = 0; i < (int)flag.size(); ++i) {
+      for (int i = 0; i < int(flag.size()); ++i) {
         LEMON_ASSERT(!flag[i], MapError());
       }
@@ -236 +236 @@
     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);
@@ -247 +247 @@
         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());
@@ -260 +260 @@
     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) {
@@ -268 +268 @@
       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;
@@ -319 +319 @@
         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());
@@ -332 +332 @@
     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());
         }
@@ -363 +363 @@
       }
       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());
         }