Mercurial > hg > octave-terminal
changeset 11069:e40e19761d06
variables.cc: Octave_map to octave_map and octave_scalar_map conversion
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 01 Oct 2010 04:30:47 -0400 |
parents | b0eec300d3fc |
children | 686d5bd22132 |
files | src/ChangeLog src/variables.cc |
diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -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.
--- a/src/variables.cc +++ b/src/variables.cc @@ -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);