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

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

Location:

lemon/bits

Files:

• alteration_notifier.h (modified) (3 diffs)
• array_map.h (modified) (12 diffs)
• base_extender.h (modified) (6 diffs)
• debug_map.h (modified) (8 diffs)
• edge_set_extender.h (modified) (8 diffs)
• graph_adaptor_extender.h (modified) (8 diffs)
• graph_extender.h (modified) (12 diffs)
• item_reader.h (modified) (1 diff)
• item_writer.h (modified) (2 diffs)
• lp_id.h (modified) (2 diffs)
• utility.h (modified) (1 diff)
• variant.h (modified) (4 diffs)
• vector_map.h (modified) (4 diffs)

lemon/bits/alteration_notifier.h

@@ -149 +149 @@
       ///
       /// Constructor which attach the observer into notifier.
-      ObserverBase(AlterationNotifier& notifier) {
-        attach(notifier);
+      ObserverBase(AlterationNotifier& nf) {
+        attach(nf);
       }
 
@@ -159 +159 @@
       ObserverBase(const ObserverBase& copy) {
         if (copy.attached()) {
-          attach(*copy._notifier());
+          attach(*copy.notifier());
         }
       }
@@ -174 +174 @@
       /// This member attaches the observer into an AlterationNotifier.
       ///
-      void attach(AlterationNotifier& notifier) {
-        notifier.attach(*this);
+      void attach(AlterationNotifier& nf) {
+        nf.attach(*this);
       }
       

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]));
         }                                                               

lemon/bits/base_extender.h

@@ -194 +194 @@
     }
 
-    Node nodeFromId(int id) const {
-      return Parent::nodeFromId(id);
-    }
-
-    Edge edgeFromId(int id) const {
-      return direct(Parent::edgeFromId(id >> 1), bool(id & 1));
-    }
-
-    UEdge uEdgeFromId(int id) const {
-      return Parent::edgeFromId(id);
+    Node nodeFromId(int ix) const {
+      return Parent::nodeFromId(ix);
+    }
+
+    Edge edgeFromId(int ix) const {
+      return direct(Parent::edgeFromId(ix >> 1), bool(ix & 1));
+    }
+
+    UEdge uEdgeFromId(int ix) const {
+      return Parent::edgeFromId(ix);
     }
 
@@ -239 +239 @@
     }
 
-    Edge findEdge(Node source, Node target, Edge prev = INVALID) const {
-      if (prev == INVALID) {
-        UEdge edge = Parent::findEdge(source, target);
+    Edge findEdge(Node s, Node t, Edge p = INVALID) const {
+      if (p == INVALID) {
+        UEdge edge = Parent::findEdge(s, t);
         if (edge != INVALID) return direct(edge, true);
-        edge = Parent::findEdge(target, source);
+        edge = Parent::findEdge(t, s);
         if (edge != INVALID) return direct(edge, false);
-      } else if (direction(prev)) {
-        UEdge edge = Parent::findEdge(source, target, prev);
+      } else if (direction(p)) {
+        UEdge edge = Parent::findEdge(s, t, p);
         if (edge != INVALID) return direct(edge, true);
-        edge = Parent::findEdge(target, source);
+        edge = Parent::findEdge(t, s);
         if (edge != INVALID) return direct(edge, false);        
       } else {
-        UEdge edge = Parent::findEdge(target, source, prev);
+        UEdge edge = Parent::findEdge(t, s, p);
         if (edge != INVALID) return direct(edge, false);              
       }
@@ -257 +257 @@
     }
 
-    UEdge findUEdge(Node source, Node target, UEdge prev = INVALID) const {
-      if (source != target) {
-        if (prev == INVALID) {
-          UEdge edge = Parent::findEdge(source, target);
+    UEdge findUEdge(Node s, Node t, UEdge p = INVALID) const {
+      if (s != t) {
+        if (p == INVALID) {
+          UEdge edge = Parent::findEdge(s, t);
           if (edge != INVALID) return edge;
-          edge = Parent::findEdge(target, source);
+          edge = Parent::findEdge(t, s);
           if (edge != INVALID) return edge;
-        } else if (Parent::source(prev) == source) {
-          UEdge edge = Parent::findEdge(source, target, prev);
+        } else if (Parent::s(p) == s) {
+          UEdge edge = Parent::findEdge(s, t, p);
           if (edge != INVALID) return edge;
-          edge = Parent::findEdge(target, source);
+          edge = Parent::findEdge(t, s);
           if (edge != INVALID) return edge;     
         } else {
-          UEdge edge = Parent::findEdge(target, source, prev);
+          UEdge edge = Parent::findEdge(t, s, p);
           if (edge != INVALID) return edge;           
         }
       } else {
-        return Parent::findEdge(source, target, prev);
+        return Parent::findEdge(s, t, p);
       }
       return INVALID;
@@ -358 +358 @@
     }
 
-    void firstInc(UEdge& edge, bool& direction, const Node& node) const {
+    void firstInc(UEdge& edge, bool& dir, const Node& node) const {
       if (Parent::aNode(node)) {
         Parent::firstFromANode(edge, node);
-        direction = true;
+        dir = true;
       } else {
         Parent::firstFromBNode(edge, node);
-        direction = static_cast<UEdge&>(edge) == INVALID;
-      }
-    }
-    void nextInc(UEdge& edge, bool& direction) const {
-      if (direction) {
+        dir = static_cast<UEdge&>(edge) == INVALID;
+      }
+    }
+    void nextInc(UEdge& edge, bool& dir) const {
+      if (dir) {
         Parent::nextFromANode(edge);
       } else {
         Parent::nextFromBNode(edge);
-        if (edge == INVALID) direction = true;
+        if (edge == INVALID) dir = true;
       }
     }
@@ -458 +458 @@
         (edge.forward ? 0 : 1);
     }
-    Edge edgeFromId(int id) const {
-      return Edge(Parent::fromUEdgeId(id >> 1), (id & 1) == 0);
+    Edge edgeFromId(int ix) const {
+      return Edge(Parent::fromUEdgeId(ix >> 1), (ix & 1) == 0);
     }
     int maxEdgeId() const {
@@ -469 +469 @@
     }
 
-    Edge direct(const UEdge& edge, bool direction) const {
-      return Edge(edge, direction);
+    Edge direct(const UEdge& edge, bool dir) const {
+      return Edge(edge, dir);
     }
 

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());
         }

lemon/bits/edge_set_extender.h

@@ -190 +190 @@
     /// Returns the base node (ie. the source in this case) of the iterator
     Node baseNode(const OutEdgeIt &e) const {
-      return Parent::source((Edge)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -197 +197 @@
     /// iterator
     Node runningNode(const OutEdgeIt &e) const {
-      return Parent::target((Edge)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
 
@@ -204 +204 @@
     /// Returns the base node (ie. the target in this case) of the iterator
     Node baseNode(const InEdgeIt &e) const {
-      return Parent::target((Edge)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -211 +211 @@
     /// iterator
     Node runningNode(const InEdgeIt &e) const {
-      return Parent::source((Edge)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
 
@@ -497 +497 @@
     /// Returns the base node (ie. the source in this case) of the iterator
     Node baseNode(const OutEdgeIt &e) const {
-      return Parent::source((Edge)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -504 +504 @@
     /// iterator
     Node runningNode(const OutEdgeIt &e) const {
-      return Parent::target((Edge)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
 
@@ -511 +511 @@
     /// Returns the base node (ie. the target in this case) of the iterator
     Node baseNode(const InEdgeIt &e) const {
-      return Parent::target((Edge)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -518 +518 @@
     /// iterator
     Node runningNode(const InEdgeIt &e) const {
-      return Parent::source((Edge)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
 

lemon/bits/graph_adaptor_extender.h

@@ -400 +400 @@
     /// Returns the base node (ie. the source in this case) of the iterator
     Node baseNode(const OutEdgeIt &e) const {
-      return Parent::source((Edge)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -407 +407 @@
     /// iterator
     Node runningNode(const OutEdgeIt &e) const {
-      return Parent::target((Edge)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
 
@@ -414 +414 @@
     /// Returns the base node (ie. the target in this case) of the iterator
     Node baseNode(const InEdgeIt &e) const {
-      return Parent::target((Edge)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -421 +421 @@
     /// iterator
     Node runningNode(const InEdgeIt &e) const {
-      return Parent::source((Edge)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
 
@@ -652 +652 @@
     /// Returns the base node (ie. the source in this case) of the iterator
     Node baseNode(const OutEdgeIt &e) const {
-      return Parent::source((Edge&)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -659 +659 @@
     /// iterator
     Node runningNode(const OutEdgeIt &e) const {
-      return Parent::target((Edge&)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
   
@@ -666 +666 @@
     /// Returns the base node (ie. the target in this case) of the iterator
     Node baseNode(const InEdgeIt &e) const {
-      return Parent::target((Edge&)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -673 +673 @@
     /// iterator
     Node runningNode(const InEdgeIt &e) const {
-      return Parent::source((Edge&)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
   

lemon/bits/graph_extender.h

@@ -557 +557 @@
     /// Returns the base node (ie. the source in this case) of the iterator
     Node baseNode(const OutEdgeIt &e) const {
-      return Parent::source((Edge)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -564 +564 @@
     /// iterator
     Node runningNode(const OutEdgeIt &e) const {
-      return Parent::target((Edge)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
 
@@ -571 +571 @@
     /// Returns the base node (ie. the target in this case) of the iterator
     Node baseNode(const InEdgeIt &e) const {
-      return Parent::target((Edge)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -578 +578 @@
     /// iterator
     Node runningNode(const InEdgeIt &e) const {
-      return Parent::source((Edge)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
 
@@ -680 +680 @@
       UEdge uedge = Parent::addEdge(from, to);
       notifier(UEdge()).add(uedge);
-      std::vector<Edge> edges;
-      edges.push_back(Parent::direct(uedge, true));
-      edges.push_back(Parent::direct(uedge, false));      
-      notifier(Edge()).add(edges);
+      std::vector<Edge> ev;
+      ev.push_back(Parent::direct(uedge, true));
+      ev.push_back(Parent::direct(uedge, false));      
+      notifier(Edge()).add(ev);
       return uedge;
     }
@@ -722 +722 @@
 
     void erase(const UEdge& uedge) {
-      std::vector<Edge> edges;
-      edges.push_back(Parent::direct(uedge, true));
-      edges.push_back(Parent::direct(uedge, false));      
-      notifier(Edge()).erase(edges);
+      std::vector<Edge> ev;
+      ev.push_back(Parent::direct(uedge, true));
+      ev.push_back(Parent::direct(uedge, false));      
+      notifier(Edge()).erase(ev);
       notifier(UEdge()).erase(uedge);
       Parent::erase(uedge);
@@ -1008 +1008 @@
     /// Returns the base node (ie. the source in this case) of the iterator
     Node baseNode(const OutEdgeIt &e) const {
-      return Parent::source((Edge&)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -1015 +1015 @@
     /// iterator
     Node runningNode(const OutEdgeIt &e) const {
-      return Parent::target((Edge&)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
   
@@ -1022 +1022 @@
     /// Returns the base node (ie. the target in this case) of the iterator
     Node baseNode(const InEdgeIt &e) const {
-      return Parent::target((Edge&)e);
+      return Parent::target(static_cast<const Edge&>(e));
     }
     /// \brief Running node of the iterator
@@ -1029 +1029 @@
     /// iterator
     Node runningNode(const InEdgeIt &e) const {
-      return Parent::source((Edge&)e);
+      return Parent::source(static_cast<const Edge&>(e));
     }
   
@@ -1296 +1296 @@
     }
   
-    UEdge addEdge(const Node& source, const Node& target) {
-      UEdge uedge = Parent::addEdge(source, target);
+    UEdge addEdge(const Node& s, const Node& t) {
+      UEdge uedge = Parent::addEdge(s, t);
       notifier(UEdge()).add(uedge);
     
-      std::vector<Edge> edges;
-      edges.push_back(Parent::direct(uedge, true));
-      edges.push_back(Parent::direct(uedge, false));
-      notifier(Edge()).add(edges);
+      std::vector<Edge> ev;
+      ev.push_back(Parent::direct(uedge, true));
+      ev.push_back(Parent::direct(uedge, false));
+      notifier(Edge()).add(ev);
     
       return uedge;
@@ -1352 +1352 @@
     
     void erase(const UEdge& uedge) {
-      std::vector<Edge> edges;
-      edges.push_back(Parent::direct(uedge, true));
-      edges.push_back(Parent::direct(uedge, false));
-      notifier(Edge()).erase(edges);
+      std::vector<Edge> ev;
+      ev.push_back(Parent::direct(uedge, true));
+      ev.push_back(Parent::direct(uedge, false));
+      notifier(Edge()).erase(ev);
       notifier(UEdge()).erase(uedge);
       Parent::erase(uedge);

lemon/bits/item_reader.h

@@ -595 +595 @@
           if (!(is >> temp)) 
             throw DataFormatError("DefaultReader<char> format error");
-          value = (char)temp;
+          value = static_cast<char>(temp);
           break;
         }

lemon/bits/item_writer.h

@@ -156 +156 @@
       if (escaped) {
         std::ostringstream ls;
-        for (int i = 0; i < (int)value.size(); ++i) {
+        for (int i = 0; i < int(value.size()); ++i) {
           writeEscape(ls, value[i]);
         }
@@ -205 +205 @@
       default:
         if (c < 0x20) {
-          os << '\\' << std::oct << (int)c;
+          os << '\\' << std::oct << static_cast<int>(c);
         } else {
           os << c;

lemon/bits/lp_id.h

@@ -78 +78 @@
           impl.index[xn] = impl.first_free;
           impl.first_free = xn;
-          for(int i = fn + 1; i < (int)impl.cross.size(); ++i) {
+          for(int i = fn + 1; i < int(impl.cross.size()); ++i) {
             impl.cross[i - 1] = impl.cross[i];
             impl.index[impl.cross[i]]--;
@@ -90 +90 @@
       void firstFloating(int& fn) const {
         fn = impl.first_index;
-        if (fn == (int)impl.cross.size()) fn = -1;
+        if (fn == int(impl.cross.size())) fn = -1;
       }
 
       void nextFloating(int& fn) const {
         ++fn;
-        if (fn == (int)impl.cross.size()) fn = -1;
+        if (fn == int(impl.cross.size())) fn = -1;
       }
 

lemon/bits/utility.h

@@ -70 +70 @@
 
 
-  class InvalidType {
-  private:
-    InvalidType();
+  struct InvalidType {
   };
 

lemon/bits/variant.h

@@ -74 +74 @@
     /// This constructor initalizes to the given value of the \c First
     /// type.
-    BiVariant(const First& first) {
+    BiVariant(const First& f) {
       flag = true;
-      new(reinterpret_cast<First*>(data)) First(first);
+      new(reinterpret_cast<First*>(data)) First(f);
     }
 
@@ -83 +83 @@
     /// This constructor initalizes to the given value of the \c
     /// Second type.
-    BiVariant(const Second& second) {
+    BiVariant(const Second& s) {
       flag = false;
-      new(reinterpret_cast<Second*>(data)) Second(second);
+      new(reinterpret_cast<Second*>(data)) Second(s);
     }
 
@@ -122 +122 @@
     /// This function sets the variant to the given value of the \c
     /// First type.
-    BiVariant& setFirst(const First& first) {
+    BiVariant& setFirst(const First& f) {
       destroy();
       flag = true;
-      new(reinterpret_cast<First*>(data)) First(first);   
+      new(reinterpret_cast<First*>(data)) First(f);   
       return *this;
     }
@@ -144 +144 @@
     /// This function sets the variant to the given value of the \c
     /// Second type.
-    BiVariant& setSecond(const Second& second) {
+    BiVariant& setSecond(const Second& s) {
       destroy();
       flag = false;
-      new(reinterpret_cast<Second*>(data)) Second(second);   
+      new(reinterpret_cast<Second*>(data)) Second(s);   
       return *this;
     }
 
     /// \brief Operator form of the \c setFirst()
-    BiVariant& operator=(const First& first) {
-      return setFirst(first);
+    BiVariant& operator=(const First& f) {
+      return setFirst(f);
     }
 
     /// \brief Operator form of the \c setSecond()
-    BiVariant& operator=(const Second& second) {
-      return setSecond(second);
+    BiVariant& operator=(const Second& s) {
+      return setSecond(s);
     }
 

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();
       }