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

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