# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1285830300 -7200
# Node ID 4ffa19147604dcc218b257b348dd86312e7756ff
# Parent  3329616444f0df91fb35e2faf9a50a984477dd21
replace Octave_map->octave_scalar_map in help.cc and load-save.cc

diff -r 3329616444f0 -r 4ffa19147604 src/ChangeLog
--- a/src/ChangeLog	Thu Sep 30 08:27:56 2010 +0200
+++ b/src/ChangeLog	Thu Sep 30 09:05:00 2010 +0200
@@ -1,3 +1,9 @@
+2010-09-30  Jaroslav Hajek  <highegg@gmail.com>
+
+	* help.cc (F__which__): Use octave_map instead of Octave_map.
+	* load-save.cc (do_load, save_fields, save_vars): Use 
+	octave_scalar_map instead of Octave_map.
+
 2010-09-30  Jaroslav Hajek  <highegg@gmail.com>
 
 	* debug.cc (Fdbstatus, Fdbstack): Use octave_map instead of
diff -r 3329616444f0 -r 4ffa19147604 src/help.cc
--- a/src/help.cc	Thu Sep 30 08:27:56 2010 +0200
+++ b/src/help.cc	Thu Sep 30 09:05:00 2010 +0200
@@ -950,7 +950,7 @@
 
       if (argc > 1)
         {
-          Octave_map m (dim_vector (1, argc-1));
+          octave_map m (dim_vector (1, argc-1));
 
           Cell names (1, argc-1);
           Cell files (1, argc-1);
diff -r 3329616444f0 -r 4ffa19147604 src/load-save.cc
--- a/src/load-save.cc	Thu Sep 30 08:27:56 2010 +0200
+++ b/src/load-save.cc	Thu Sep 30 09:05:00 2010 +0200
@@ -337,7 +337,7 @@
 {
   octave_value retval;
 
-  Octave_map retstruct;
+  octave_scalar_map retstruct;
 
   std::ostringstream output_buf;
   std::list<std::string> symbol_names;
@@ -987,7 +987,7 @@
 // in the format specified by FMT.
 
 static size_t
-save_fields (std::ostream& os, const Octave_map& m,
+save_fields (std::ostream& os, const octave_scalar_map& m,
              const std::string& pattern,
              load_save_format fmt, bool save_as_floats)
 {
@@ -995,13 +995,13 @@
   
   size_t saved = 0;
 
-  for (Octave_map::const_iterator p = m.begin (); p != m.end (); p++)
+  for (octave_scalar_map::const_iterator p = m.begin (); p != m.end (); p++)
     {
       std::string empty_str;
 
-      if (pat.match(p->first))
+      if (pat.match(m.key (p)))
         {
-          do_save (os, p->second(0), p->first, empty_str,
+          do_save (os, m.contents (p), m.key (p), empty_str,
                    0, fmt, save_as_floats);
 
           saved++;
@@ -1279,7 +1279,7 @@
                  struct_name.c_str ());
           return;
         }
-      Octave_map struct_var_map = struct_var.map_value ();
+      octave_scalar_map struct_var_map = struct_var.scalar_map_value ();
 
       ++argv_idx;