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

lemon/graph_utils.h

@@ -791 +791 @@
     /// Destructor of the GraphCopy
     ~GraphCopy() {
-      for (int i = 0; i < (int)nodeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
         delete nodeMapCopies[i];
       }
-      for (int i = 0; i < (int)edgeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
         delete edgeMapCopies[i];
       }
@@ -837 +837 @@
     ///
     /// Make a copy of the given node.
-    GraphCopy& node(TNode& tnode, const Node& node) {
+    GraphCopy& node(TNode& tnode, const Node& snode) {
       nodeMapCopies.push_back(new _graph_utils_bits::ItemCopy<Source, Node, 
-                              NodeRefMap, TNode>(tnode, node));
+                              NodeRefMap, TNode>(tnode, snode));
       return *this;
     }
@@ -880 +880 @@
     ///
     /// Make a copy of the given edge.
-    GraphCopy& edge(TEdge& tedge, const Edge& edge) {
+    GraphCopy& edge(TEdge& tedge, const Edge& sedge) {
       edgeMapCopies.push_back(new _graph_utils_bits::ItemCopy<Source, Edge, 
-                              EdgeRefMap, TEdge>(tedge, edge));
+                              EdgeRefMap, TEdge>(tedge, sedge));
       return *this;
     }
@@ -894 +894 @@
       _graph_utils_bits::GraphCopySelector<Target>::
         copy(target, source, nodeRefMap, edgeRefMap);
-      for (int i = 0; i < (int)nodeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
         nodeMapCopies[i]->copy(source, nodeRefMap);
       }
-      for (int i = 0; i < (int)edgeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
         edgeMapCopies[i]->copy(source, edgeRefMap);
       }      
@@ -968 +968 @@
 
       Value operator[](const Key& key) const {
-        bool forward = (source.direction(key) == 
-                        (node_ref[source.source((UEdge)key)] == 
-                         target.source(uedge_ref[(UEdge)key])));
+        bool forward = 
+          (source.direction(key) == 
+           (node_ref[source.source(static_cast<const UEdge&>(key))] == 
+            target.source(uedge_ref[static_cast<const UEdge&>(key)])));
         return target.direct(uedge_ref[key], forward); 
       }
@@ -995 +996 @@
     /// Destructor of the GraphCopy
     ~UGraphCopy() {
-      for (int i = 0; i < (int)nodeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
         delete nodeMapCopies[i];
       }
-      for (int i = 0; i < (int)edgeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
         delete edgeMapCopies[i];
       }
-      for (int i = 0; i < (int)uEdgeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(uEdgeMapCopies.size()); ++i) {
         delete uEdgeMapCopies[i];
       }
@@ -1044 +1045 @@
     ///
     /// Make a copy of the given node.
-    UGraphCopy& node(TNode& tnode, const Node& node) {
+    UGraphCopy& node(TNode& tnode, const Node& snode) {
       nodeMapCopies.push_back(new _graph_utils_bits::ItemCopy<Source, Node, 
-                              NodeRefMap, TNode>(tnode, node));
+                              NodeRefMap, TNode>(tnode, snode));
       return *this;
     }
@@ -1087 +1088 @@
     ///
     /// Make a copy of the given edge.
-    UGraphCopy& edge(TEdge& tedge, const Edge& edge) {
+    UGraphCopy& edge(TEdge& tedge, const Edge& sedge) {
       edgeMapCopies.push_back(new _graph_utils_bits::ItemCopy<Source, Edge, 
-                              EdgeRefMap, TEdge>(tedge, edge));
+                              EdgeRefMap, TEdge>(tedge, sedge));
       return *this;
     }
@@ -1130 +1131 @@
     ///
     /// Make a copy of the given undirected edge.
-    UGraphCopy& uEdge(TUEdge& tuedge, const UEdge& uedge) {
+    UGraphCopy& uEdge(TUEdge& tuedge, const UEdge& suedge) {
       uEdgeMapCopies.push_back(new _graph_utils_bits::ItemCopy<Source, UEdge, 
-                               UEdgeRefMap, TUEdge>(tuedge, uedge));
+                               UEdgeRefMap, TUEdge>(tuedge, suedge));
       return *this;
     }
@@ -1145 +1146 @@
       _graph_utils_bits::UGraphCopySelector<Target>::
         copy(target, source, nodeRefMap, uEdgeRefMap);
-      for (int i = 0; i < (int)nodeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
         nodeMapCopies[i]->copy(source, nodeRefMap);
       }
-      for (int i = 0; i < (int)uEdgeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(uEdgeMapCopies.size()); ++i) {
         uEdgeMapCopies[i]->copy(source, uEdgeRefMap);
       }
-      for (int i = 0; i < (int)edgeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
         edgeMapCopies[i]->copy(source, edgeRefMap);
       }
@@ -1246 +1247 @@
 
       Value operator[](const Key& key) const {
-        bool forward = (source.direction(key) == 
-                        (node_ref[source.source((UEdge)key)] == 
-                         target.source(uedge_ref[(UEdge)key])));
+        bool forward = 
+          (source.direction(key) == 
+           (node_ref[source.source(static_cast<const UEdge&>(key))] == 
+            target.source(uedge_ref[static_cast<const UEdge&>(key)])));
         return target.direct(uedge_ref[key], forward); 
       }
@@ -1272 +1274 @@
     /// Destructor of the GraphCopy
     ~BpUGraphCopy() {
-      for (int i = 0; i < (int)aNodeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(aNodeMapCopies.size()); ++i) {
         delete aNodeMapCopies[i];
       }
-      for (int i = 0; i < (int)bNodeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(bNodeMapCopies.size()); ++i) {
         delete bNodeMapCopies[i];
       }
-      for (int i = 0; i < (int)nodeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
         delete nodeMapCopies[i];
       }
-      for (int i = 0; i < (int)edgeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
         delete edgeMapCopies[i];
       }
-      for (int i = 0; i < (int)uEdgeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(uEdgeMapCopies.size()); ++i) {
         delete uEdgeMapCopies[i];
       }
@@ -1394 +1396 @@
     ///
     /// Make a copy of the given node.
-    BpUGraphCopy& node(TNode& tnode, const Node& node) {
+    BpUGraphCopy& node(TNode& tnode, const Node& snode) {
       nodeMapCopies.push_back(new _graph_utils_bits::ItemCopy<Source, Node, 
-                              NodeRefMap, TNode>(tnode, node));
+                              NodeRefMap, TNode>(tnode, snode));
       return *this;
     }
@@ -1437 +1439 @@
     ///
     /// Make a copy of the given edge.
-    BpUGraphCopy& edge(TEdge& tedge, const Edge& edge) {
+    BpUGraphCopy& edge(TEdge& tedge, const Edge& sedge) {
       edgeMapCopies.push_back(new _graph_utils_bits::ItemCopy<Source, Edge, 
-                              EdgeRefMap, TEdge>(tedge, edge));
+                              EdgeRefMap, TEdge>(tedge, sedge));
       return *this;
     }
@@ -1480 +1482 @@
     ///
     /// Make a copy of the given undirected edge.
-    BpUGraphCopy& uEdge(TUEdge& tuedge, const UEdge& uedge) {
+    BpUGraphCopy& uEdge(TUEdge& tuedge, const UEdge& suedge) {
       uEdgeMapCopies.push_back(new _graph_utils_bits::ItemCopy<Source, UEdge, 
-                               UEdgeRefMap, TUEdge>(tuedge, uedge));
+                               UEdgeRefMap, TUEdge>(tuedge, suedge));
       return *this;
     }
@@ -1497 +1499 @@
       _graph_utils_bits::BpUGraphCopySelector<Target>::
         copy(target, source, aNodeRefMap, bNodeRefMap, uEdgeRefMap);
-      for (int i = 0; i < (int)aNodeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(aNodeMapCopies.size()); ++i) {
         aNodeMapCopies[i]->copy(source, aNodeRefMap);
       }
-      for (int i = 0; i < (int)bNodeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(bNodeMapCopies.size()); ++i) {
         bNodeMapCopies[i]->copy(source, bNodeRefMap);
       }
-      for (int i = 0; i < (int)nodeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
         nodeMapCopies[i]->copy(source, nodeRefMap);
       }
-      for (int i = 0; i < (int)uEdgeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(uEdgeMapCopies.size()); ++i) {
         uEdgeMapCopies[i]->copy(source, uEdgeRefMap);
       }
-      for (int i = 0; i < (int)edgeMapCopies.size(); ++i) {
+      for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
         edgeMapCopies[i]->copy(source, edgeRefMap);
       }
@@ -1778 +1780 @@
     /// \c AlterationNotifier.
     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) {
         Value val = Map::operator[](keys[i]);
         typename Container::iterator it = invMap.find(val);
@@ -1874 +1876 @@
     explicit DescriptorMap(const Graph& _graph) : Map(_graph) {
       Item it;
-      const typename Map::Notifier* notifier = Map::notifier(); 
-      for (notifier->first(it); it != INVALID; notifier->next(it)) {
+      const typename Map::Notifier* nf = Map::notifier(); 
+      for (nf->first(it); it != INVALID; nf->next(it)) {
         Map::set(it, invMap.size());
         invMap.push_back(it);   
@@ -1899 +1901 @@
     virtual void add(const std::vector<Item>& items) {
       Map::add(items);
-      for (int i = 0; i < (int)items.size(); ++i) {
+      for (int i = 0; i < int(items.size()); ++i) {
         Map::set(items[i], invMap.size());
         invMap.push_back(items[i]);
@@ -1921 +1923 @@
     /// \c AlterationNotifier.
     virtual void erase(const std::vector<Item>& items) {
-      for (int i = 0; i < (int)items.size(); ++i) {
+      for (int i = 0; i < int(items.size()); ++i) {
         Map::set(invMap.back(), Map::operator[](items[i]));
         invMap[Map::operator[](items[i])] = invMap.back();
@@ -1936 +1938 @@
       Map::build();
       Item it;
-      const typename Map::Notifier* notifier = Map::notifier(); 
-      for (notifier->first(it); it != INVALID; notifier->next(it)) {
+      const typename Map::Notifier* nf = Map::notifier(); 
+      for (nf->first(it); it != INVALID; nf->next(it)) {
         Map::set(it, invMap.size());
         invMap.push_back(it);   
@@ -2281 +2283 @@
       virtual void add(const std::vector<Key>& keys) {
         Parent::add(keys);
-        for (int i = 0; i < (int)keys.size(); ++i) {
+        for (int i = 0; i < int(keys.size()); ++i) {
           Parent::set(keys[i], 0);
         }
@@ -2314 +2316 @@
 
     virtual void add(const std::vector<Edge>& edges) {
-      for (int i = 0; i < (int)edges.size(); ++i) {
+      for (int i = 0; i < int(edges.size()); ++i) {
         ++deg[graph.target(edges[i])];
       }
@@ -2324 +2326 @@
 
     virtual void erase(const std::vector<Edge>& edges) {
-      for (int i = 0; i < (int)edges.size(); ++i) {
+      for (int i = 0; i < int(edges.size()); ++i) {
         --deg[graph.target(edges[i])];
       }
@@ -2393 +2395 @@
       virtual void add(const std::vector<Key>& keys) {
         Parent::add(keys);
-        for (int i = 0; i < (int)keys.size(); ++i) {
+        for (int i = 0; i < int(keys.size()); ++i) {
           Parent::set(keys[i], 0);
         }
@@ -2426 +2428 @@
 
     virtual void add(const std::vector<Edge>& edges) {
-      for (int i = 0; i < (int)edges.size(); ++i) {
+      for (int i = 0; i < int(edges.size()); ++i) {
         ++deg[graph.source(edges[i])];
       }
@@ -2436 +2438 @@
 
     virtual void erase(const std::vector<Edge>& edges) {
-      for (int i = 0; i < (int)edges.size(); ++i) {
+      for (int i = 0; i < int(edges.size()); ++i) {
         --deg[graph.source(edges[i])];
       }