diff -r e997802b855c -r 87f7c54892df src/work/alpar/rw_nonref_map.cc
--- a/src/work/alpar/rw_nonref_map.cc	Sat Nov 13 12:53:28 2004 +0000
+++ b/src/work/alpar/rw_nonref_map.cc	Sat Nov 13 17:07:10 2004 +0000
@@ -10,8 +10,8 @@
   typedef GG Graph;
   typedef typename GG::Edge Edge;
   
-  typedef Edge KeyType;
-  typedef TT ValueType;
+  typedef Edge Key;
+  typedef TT Value;
   
   class RefType 
   {
@@ -20,15 +20,15 @@
   public:
     RefType(Graph &_G,Edge _e) : G(_G), e(_e) { }
     
-    operator ValueType() const 
+    operator Value() const 
     {
-      ValueType tmp;
+      Value tmp;
       std::cout << G.id(G.source(e)) << "->"
 		<< G.id(G.target(e)) << ": ";
       std::cin  >> tmp;
       return tmp;
     }
-    ValueType operator = (ValueType v) const
+    Value operator = (Value v) const
     {
       std::cout << G.id(G.source(e)) << "->"
 		<< G.id(G.target(e)) << ": " << v << '\n';
@@ -47,23 +47,23 @@
 class NullMap
 {
 public:
-  typedef K KeyType;
-  typedef T ValueType;
+  typedef K Key;
+  typedef T Value;
   
   class RefType 
   {
-    ValueType val;
+    Value val;
   public:
-    RefType(ValueType v) : val(v) { }   
-    operator ValueType() const { return val; }
-    ValueType operator = (ValueType v) const { return val; }
+    RefType(Value v) : val(v) { }   
+    operator Value() const { return val; }
+    Value operator = (Value v) const { return val; }
   };
   
 private:
-  ValueType val;
+  Value val;
 public:
-  NullMap(ValueType v) : val(v) { }
-  RefType operator[] (KeyType e) const { return RefType(v);}  
+  NullMap(Value v) : val(v) { }
+  RefType operator[] (Key e) const { return RefType(v);}  
 };
 
 int main()