Changeset 433:d9fac1497298 in lemon-0.x for src/include

Timestamp:

04/27/04 10:19:39 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

g++-3.4.0, misc

File:

• src/include/dijkstra.h (modified) (3 diffs)

src/include/dijkstra.h

@@ -44 +44 @@
 #else
   template <typename Graph,
-            typename LengthMap=typename Graph::EdgeMap<int>,
+            typename LengthMap=typename Graph::template EdgeMap<int>,
             template <class,class,class> class Heap = BinHeap >
 #endif
@@ -55 +55 @@
     
     typedef typename LengthMap::ValueType ValueType;
-    typedef typename Graph::NodeMap<Edge> PredMap;
-    typedef typename Graph::NodeMap<Node> PredNodeMap;
-    typedef typename Graph::NodeMap<ValueType> DistMap;
+    typedef typename Graph::template NodeMap<Edge> PredMap;
+    typedef typename Graph::template NodeMap<Node> PredNodeMap;
+    typedef typename Graph::template NodeMap<ValueType> DistMap;
 
   private:
@@ -155 +155 @@
     }
     
-    typename Graph::NodeMap<int> heap_map(G,-1);
-    
-    Heap<Node,ValueType,typename Graph::NodeMap<int> > heap(heap_map);
+    typename Graph::template NodeMap<int> heap_map(G,-1);
+    
+    Heap<Node, ValueType, typename Graph::template NodeMap<int> > 
+      heap(heap_map);
     
     heap.push(s,0);