# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1285921847 14400
# Node ID e40e19761d0680d39cd1877d14a104dd4252a842
# Parent  b0eec300d3fc7975af826434f0db3a5de4f1c31b
variables.cc: Octave_map to octave_map and octave_scalar_map conversion

diff -r b0eec300d3fc -r e40e19761d06 src/ChangeLog
--- a/src/ChangeLog	Thu Sep 30 21:50:35 2010 +0200
+++ b/src/ChangeLog	Fri Oct 01 04:30:47 2010 -0400
@@ -1,3 +1,8 @@
+2010-10-01  John W. Eaton  <jwe@octave.org>
+
+	* variables.cc (symbol_info_list::map_value): Use
+	octave_scalar_map and octave_map instead of Octave_map.
+
 2010-09-30  Jaroslav Hajek  <highegg@gmail.com>
 
 	* oct-map.h (octave_fields::nil_rep): Make a static function.
diff -r b0eec300d3fc -r e40e19761d06 src/variables.cc
--- a/src/variables.cc	Thu Sep 30 21:50:35 2010 +0200
+++ b/src/variables.cc	Fri Oct 01 04:30:47 2010 -0400
@@ -1218,7 +1218,7 @@
 
   bool empty (void) const { return lst.empty (); }
 
-  Octave_map
+  octave_map
   map_value (const std::string& caller_function_name, int nesting_level) const
   {
     size_t len = lst.size ();
@@ -1239,7 +1239,7 @@
       {
         const symbol_info& si = *p++;
 
-        Octave_map ni;
+        octave_scalar_map ni;
 
         ni.assign ("function", caller_function_name);
         ni.assign ("level", nesting_level);
@@ -1258,7 +1258,7 @@
         nesting_info(j) = ni;
       }
 
-    Octave_map info;
+    octave_map info;
 
     info.assign ("name", name_info);
     info.assign ("size", size_info);