Mercurial > octave-nkf
changeset 11063:e378c0176a38
oct-errno.cc.in: use octve_scalar_map instead of Octave_map
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 30 Sep 2010 05:11:59 -0400 |
| parents | 88d78ee12ee8 |
| children | 61a6c99d8ff7 |
| files | src/ChangeLog src/oct-errno.cc.in |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Sep 30 02:05:31 2010 -0500 +++ b/src/ChangeLog Thu Sep 30 05:11:59 2010 -0400 @@ -1,3 +1,8 @@ +2010-09-30 John W. Eaton <jwe@octave.org> + + * oct-errno.cc.in (octave_errno::do_list, octave_errno::list): + Use octave_scalar_map instead of Octave_map. + 2010-09-30 Jordi Gutiérrez Hermoso <jordigh@gmail.com> * DLD-FUNCTIONS/gcd.cc (divide): New function, complex integer division with remainder.
--- a/src/oct-errno.cc.in Thu Sep 30 02:05:31 2010 -0500 +++ b/src/oct-errno.cc.in Thu Sep 30 05:11:59 2010 -0400 @@ -310,10 +310,10 @@ return (instance_ok ()) ? instance->do_lookup (name) : -1; } -Octave_map +octave_scalar_map octave_errno::list (void) { - return (instance_ok ()) ? instance->do_list () : Octave_map (); + return (instance_ok ()) ? instance->do_list () : octave_scalar_map (); } int @@ -322,10 +322,10 @@ return (errno_tbl.find (name) != errno_tbl.end ()) ? errno_tbl[name] : -1; } -Octave_map +octave_scalar_map octave_errno::do_list (void) { - Octave_map retval; + octave_scalar_map retval; for (std::map<std::string, int>::const_iterator p = errno_tbl.begin (); p != errno_tbl.end ();