Changeset 1234:49d018060749 in lemon-0.x for src/lemon/max_matching.h

Timestamp:

03/21/05 12:46:13 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1661

Message:

Several changes in order to compile with gcc-3.4

File:

• src/lemon/max_matching.h (modified) (5 diffs)

src/lemon/max_matching.h

@@ -263 +263 @@
                     UFE& blossom, UFE& tree);
 
-    void normShrink(Node v, typename Graph::NodeMap<Node>& ear,  
+    void normShrink(Node v, typename Graph::template NodeMap<Node>& ear,  
                     UFE& blossom, UFE& tree);
 
-    bool noShrinkStep(Node x, typename Graph::NodeMap<Node>& ear,  
+    bool noShrinkStep(Node x, typename Graph::template NodeMap<Node>& ear,  
                       UFE& blossom, UFE& tree, std::queue<Node>& Q);
 
-    void shrinkStep(Node& top, Node& middle, Node& bottom, typename Graph::NodeMap<Node>& ear,  
+    void shrinkStep(Node& top, Node& middle, Node& bottom,
+                    typename Graph::template NodeMap<Node>& ear,  
                     UFE& blossom, UFE& tree, std::queue<Node>& Q);
 
-    void augment(Node x, typename Graph::NodeMap<Node>& ear,  
+    void augment(Node x, typename Graph::template NodeMap<Node>& ear,  
                  UFE& blossom, UFE& tree);
 
@@ -387 +388 @@
 
   template <typename Graph>
-  void MaxMatching<Graph>::normShrink(Node v, typename Graph::NodeMap<Node>& ear,  
+  void MaxMatching<Graph>::normShrink(Node v,
+                                      typename Graph::template
+                                      NodeMap<Node>& ear,  
                                       UFE& blossom, UFE& tree) {
-
     std::queue<Node> Q;   //queue of the unscanned nodes
     Q.push(v);  
@@ -491 +493 @@
 
   template <typename Graph>
-  bool MaxMatching<Graph>::noShrinkStep(Node x, typename Graph::NodeMap<Node>& ear,  
-                                        UFE& blossom, UFE& tree, std::queue<Node>& Q) {
+  bool MaxMatching<Graph>::noShrinkStep(Node x,
+                                        typename Graph::template 
+                                        NodeMap<Node>& ear,  
+                                        UFE& blossom, UFE& tree,
+                                        std::queue<Node>& Q) {
     for( IncEdgeIt e(g,x); e!= INVALID; ++e ) {
       Node y=g.runningNode(e);
@@ -520 +525 @@
 
   template <typename Graph>
-  void MaxMatching<Graph>::shrinkStep(Node& top, Node& middle, Node& bottom, typename Graph::NodeMap<Node>& ear,  
-                                      UFE& blossom, UFE& tree, std::queue<Node>& Q) {
+  void MaxMatching<Graph>::shrinkStep(Node& top, Node& middle, Node& bottom,
+                                      typename Graph::template
+                                      NodeMap<Node>& ear,  
+                                      UFE& blossom, UFE& tree,
+                                      std::queue<Node>& Q) {
     ear.set(top,bottom);
     Node t=top;
@@ -543 +551 @@
 
   template <typename Graph>
-  void MaxMatching<Graph>::augment(Node x, typename Graph::NodeMap<Node>& ear,  
+  void MaxMatching<Graph>::augment(Node x,
+                                   typename Graph::template NodeMap<Node>& ear,  
                                    UFE& blossom, UFE& tree) { 
     Node v=_mate[x];