diff -r e997802b855c -r 87f7c54892df src/work/marci/graph_concept.h
--- a/src/work/marci/graph_concept.h	Sat Nov 13 12:53:28 2004 +0000
+++ b/src/work/marci/graph_concept.h	Sat Nov 13 17:07:10 2004 +0000
@@ -167,8 +167,8 @@
     template<class T> class NodeMap
     {
     public:
-      typedef T ValueType;
-      typedef Node KeyType;
+      typedef T Value;
+      typedef Node Key;
 
       NodeMap(const GraphConcept& g) { }
       NodeMap(const GraphConcept& g, T t) { }
@@ -205,8 +205,8 @@
     template<class T> class EdgeMap
     {
     public:
-      typedef T ValueType;
-      typedef Edge KeyType;
+      typedef T Value;
+      typedef Edge Key;
 
       EdgeMap(const GraphConcept& g) {}
       EdgeMap(const GraphConcept& g, T t) {}