# HG changeset patch # User John W. Eaton # Date 1285837919 14400 # Node ID e378c0176a38203b1babb2c792a18e2565376d1a # Parent 88d78ee12ee82837f1acaee6b7f62ef29df923ea oct-errno.cc.in: use octve_scalar_map instead of Octave_map diff -r 88d78ee12ee8 -r e378c0176a38 src/ChangeLog --- 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 + + * 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 * DLD-FUNCTIONS/gcd.cc (divide): New function, complex integer division with remainder. diff -r 88d78ee12ee8 -r e378c0176a38 src/oct-errno.cc.in --- 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::const_iterator p = errno_tbl.begin (); p != errno_tbl.end ();