Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/bits/array_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/array_map.h (modified) (12 diffs)

lemon/bits/array_map.h

@@ -82 +82 @@
       Parent::attach(graph.notifier(Item()));
       allocate_memory();
-      Notifier* notifier = Parent::notifier();
-      Item it;
-      for (notifier->first(it); it != INVALID; notifier->next(it)) {
-        int id = notifier->id(it);;
+      Notifier* nf = Parent::notifier();
+      Item it;
+      for (nf->first(it); it != INVALID; nf->next(it)) {
+        int id = nf->id(it);;
         allocator.construct(&(values[id]), Value());
       }                                                         
@@ -96 +96 @@
       Parent::attach(graph.notifier(Item()));
       allocate_memory();
-      Notifier* notifier = Parent::notifier();
-      Item it;
-      for (notifier->first(it); it != INVALID; notifier->next(it)) {
-        int id = notifier->id(it);;
+      Notifier* nf = Parent::notifier();
+      Item it;
+      for (nf->first(it); it != INVALID; nf->next(it)) {
+        int id = nf->id(it);;
         allocator.construct(&(values[id]), value);
       }                                                         
@@ -114 +114 @@
       if (capacity == 0) return;
       values = allocator.allocate(capacity);
-      Notifier* notifier = Parent::notifier();
-      Item it;
-      for (notifier->first(it); it != INVALID; notifier->next(it)) {
-        int id = notifier->id(it);;
+      Notifier* nf = Parent::notifier();
+      Item it;
+      for (nf->first(it); it != INVALID; nf->next(it)) {
+        int id = nf->id(it);;
         allocator.construct(&(values[id]), copy.values[id]);
       }
@@ -143 +143 @@
     ArrayMap& operator=(const CMap& cmap) {
       checkConcept<concepts::ReadMap<Key, _Value>, CMap>();
-      const typename Parent::Notifier* notifier = Parent::notifier();
-      Item it;
-      for (notifier->first(it); it != INVALID; notifier->next(it)) {
+      const typename Parent::Notifier* nf = Parent::notifier();
+      Item it;
+      for (nf->first(it); it != INVALID; nf->next(it)) {
         set(it, cmap[it]);
       }
@@ -202 +202 @@
     /// and it overrides the add() member function of the observer base.     
     virtual void add(const Key& key) {
-      Notifier* notifier = Parent::notifier();
-      int id = notifier->id(key);
+      Notifier* nf = Parent::notifier();
+      int id = nf->id(key);
       if (id >= capacity) {
         int new_capacity = (capacity == 0 ? 1 : capacity);
@@ -211 +211 @@
         Value* new_values = allocator.allocate(new_capacity);
         Item it;
-        for (notifier->first(it); it != INVALID; notifier->next(it)) {
-          int jd = notifier->id(it);;
+        for (nf->first(it); it != INVALID; nf->next(it)) {
+          int jd = nf->id(it);;
           if (id != jd) {
             allocator.construct(&(new_values[jd]), values[jd]);
@@ -230 +230 @@
     /// and it overrides the add() member function of the observer base.     
     virtual void add(const std::vector<Key>& keys) {
-      Notifier* notifier = Parent::notifier();
+      Notifier* nf = Parent::notifier();
       int max_id = -1;
-      for (int i = 0; i < (int)keys.size(); ++i) {
-        int id = notifier->id(keys[i]);
+      for (int i = 0; i < int(keys.size()); ++i) {
+        int id = nf->id(keys[i]);
         if (id > max_id) {
           max_id = id;
@@ -245 +245 @@
         Value* new_values = allocator.allocate(new_capacity);
         Item it;
-        for (notifier->first(it); it != INVALID; notifier->next(it)) {
-          int id = notifier->id(it);
+        for (nf->first(it); it != INVALID; nf->next(it)) {
+          int id = nf->id(it);
           bool found = false;
-          for (int i = 0; i < (int)keys.size(); ++i) {
-            int jd = notifier->id(keys[i]);
+          for (int i = 0; i < int(keys.size()); ++i) {
+            int jd = nf->id(keys[i]);
             if (id == jd) {
               found = true;
@@ -263 +263 @@
         capacity = new_capacity;
       }
-      for (int i = 0; i < (int)keys.size(); ++i) {
-        int id = notifier->id(keys[i]);
+      for (int i = 0; i < int(keys.size()); ++i) {
+        int id = nf->id(keys[i]);
         allocator.construct(&(values[id]), Value());
       }
@@ -283 +283 @@
     /// and it overrides the erase() member function of the observer base.     
     virtual void erase(const std::vector<Key>& keys) {
-      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]);
         allocator.destroy(&(values[id]));
@@ -294 +294 @@
     /// and it overrides the build() member function of the observer base. 
     virtual void build() {
-      Notifier* notifier = Parent::notifier();
+      Notifier* nf = Parent::notifier();
       allocate_memory();
       Item it;
-      for (notifier->first(it); it != INVALID; notifier->next(it)) {
-        int id = notifier->id(it);;
+      for (nf->first(it); it != INVALID; nf->next(it)) {
+        int id = nf->id(it);;
         allocator.construct(&(values[id]), Value());
       }                                                         
@@ -308 +308 @@
     /// and it overrides the clear() member function of the observer base.     
     virtual void clear() {      
-      Notifier* notifier = Parent::notifier();
+      Notifier* nf = Parent::notifier();
       if (capacity != 0) {
         Item it;
-        for (notifier->first(it); it != INVALID; notifier->next(it)) {
-          int id = notifier->id(it);
+        for (nf->first(it); it != INVALID; nf->next(it)) {
+          int id = nf->id(it);
           allocator.destroy(&(values[id]));
         }