diff -r 0c7d717b9538 -r eb8bb91ba9e2 test/heap_test.h
--- a/test/heap_test.h	Fri Oct 14 11:02:34 2005 +0000
+++ b/test/heap_test.h	Fri Oct 14 11:03:40 2005 +0000
@@ -1,4 +1,4 @@
-// -+- c++ -+-
+// -*- c++ -*-
 
 #include <vector>
 #include <algorithm>
@@ -65,11 +65,6 @@
 
 
 
-template <typename _Traits, typename _Heap>
-struct DefHeapTraits : public _Traits {
-  typedef _Heap Heap;
-};
-
 template <typename _Graph, typename _LengthMap, typename _Heap>
 void dijkstraHeapTest(_Graph& graph, _LengthMap& length,
 		      typename _Graph::Node& start) {
@@ -83,9 +78,8 @@
   typedef typename Graph::NodeIt NodeIt;
   typedef typename Graph::EdgeIt EdgeIt;
 
-  Dijkstra<Graph, LengthMap, 
-    DefHeapTraits<DijkstraDefaultTraits<Graph, LengthMap>, Heap> > 
-    dijkstra(graph, length);
+  typename Dijkstra<Graph, LengthMap>::template DefHeap<Heap>::
+    Create dijkstra(graph, length);
 
   dijkstra.run(start);
 
@@ -94,7 +88,7 @@
     Node v=graph.target(e);
     if (dijkstra.reached(u)) {
       check( dijkstra.dist(v) - dijkstra.dist(u) <= length[e],
-	     "Error in a shortest path tree edge!");
+      	     "Error in a shortest path tree edge!");
     }
   }