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

lemon/bits/vector_map.h

@@ -135 +135 @@
     VectorMap& operator=(const CMap& cmap) {
       checkConcept<concepts::ReadMap<Key, _Value>, CMap>();
-      const typename Parent::Notifier* notifier = Parent::notifier();
+      const typename Parent::Notifier* nf = Parent::notifier();
       Item it;
-      for (notifier->first(it); it != INVALID; notifier->next(it)) {
+      for (nf->first(it); it != INVALID; nf->next(it)) {
         set(it, cmap[it]);
       }
@@ -177 +177 @@
     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);
       }
@@ -188 +188 @@
     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) {
@@ -210 +210 @@
     /// 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) {
         container[Parent::notifier()->id(keys[i])] = Value();
       }