Mercurial > hg > octave-lyh

changeset 11043:e9966851619b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
getpwent.cc, getgrent.cc, getrusage.cc: use octave_scalar_map instead of Octave_map
author John W. Eaton <jwe@octave.org>
date Wed, 29 Sep 2010 03:19:37 -0400
parents f6b7b6e5b8b8
children 757249bb4888
files src/ChangeLog src/DLD-FUNCTIONS/getgrent.cc src/DLD-FUNCTIONS/getpwent.cc src/DLD-FUNCTIONS/getrusage.cc
diffstat 4 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-29  John W. Eaton  <jwe@octave.org>
+
+	* DLD-FUNCTIONS/getpwent.cc (mk_pw_map): Use octave_scalar_map
+	instead of Octave_map.
+	* DLD-FUNCTIONS/getgrent.cc (mk_gr_map): Likewise.
+	* DLD-FUNCTIONS/getrusage.cc (Fgetrusage): Likewise.
+
 2010-09-29  John W. Eaton  <jwe@octave.org>
 
 	* DLD-FUNCTIONS/time.cc (intfield, stringfield): New functions.
--- a/src/DLD-FUNCTIONS/getgrent.cc
+++ b/src/DLD-FUNCTIONS/getgrent.cc
@@ -48,7 +48,7 @@
 
   if (gr)
     {
-      Octave_map m;
+      octave_scalar_map m;
 
       m.assign ("name", gr.name ());
       m.assign ("passwd", gr.passwd ());
--- a/src/DLD-FUNCTIONS/getpwent.cc
+++ b/src/DLD-FUNCTIONS/getpwent.cc
@@ -48,7 +48,7 @@
 
   if (pw)
     {
-      Octave_map m;
+      octave_scalar_map m;
 
       m.assign ("name", pw.name ());
       m.assign ("passwd", pw.passwd ());
--- a/src/DLD-FUNCTIONS/getrusage.cc
+++ b/src/DLD-FUNCTIONS/getrusage.cc
@@ -123,8 +123,8 @@
 @end table\n\
 @end deftypefn")
 {
-  Octave_map m;
-  Octave_map tv_tmp;
+  octave_scalar_map m;
+  octave_scalar_map tv_tmp;
 
   // FIXME -- maybe encapsulate all of this in a liboctave class
 #if defined (HAVE_GETRUSAGE)