--- a/src/oct-map.cc	Thu Dec 05 04:43:20 2002 +0000
+++ b/src/oct-map.cc	Fri Dec 06 21:29:19 2002 +0000
@@ -37,9 +37,9 @@
 octave_value_list
 Octave_map::operator [] (const std::string& key) const
 {
-  Pix p = map.seek (key);
+  const_iterator p = seek (key);
 
-  return p ? map.contents (p) : octave_value_list ();
+  return p != end () ? p->second : octave_value_list ();
 }
 
 string_vector
@@ -50,7 +50,7 @@
   string_vector names (len);
 
   int i = 0;
-  for (Pix p = first (); p != 0; next (p))
+  for (const_iterator p = begin (); p != end (); p++)
     names[i++] = key (p);
 
   return names;
@@ -61,7 +61,7 @@
 {
   if (array_len == 0 && length () != 0)
     {
-      Pix p = first ();
+      const_iterator p = begin ();
       array_len = contents(p).length ();
     }
 
@@ -142,7 +142,7 @@
 	}
       else if (rhs_len > len)
 	{
-	  for (Pix p = first (); p != 0; next (p))
+	  for (iterator p = begin (); p != end (); p++)
 	    contents(p).resize (rhs_len, fill_value);
 
 	  array_len = rhs_len;
@@ -157,11 +157,11 @@
 Octave_map&
 Octave_map::assign (const std::string& key, const octave_value_list& rhs)
 {
-  if (map.empty ())
+  if (empty ())
     map[key] = rhs;
   else
     {
-      octave_value_list tmp = map.contents (map.first ());
+      octave_value_list tmp = contents (begin ());
 
       if (tmp.length () == rhs.length ())
 	map[key] = rhs;
@@ -177,7 +177,7 @@
 {
   Octave_map retval;
 
-  for (Pix p = first (); p != 0; next (p))
+  for (iterator p = begin (); p != end (); p++)
     {
       octave_value_list tmp = contents(p).index (idx);