# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1285744777 14400
# Node ID e9966851619b6fe47594781cbd321fe8ffd57acd
# Parent  f6b7b6e5b8b8d8cc2d6fb9e767f2b22b74984a94
getpwent.cc, getgrent.cc, getrusage.cc: use octave_scalar_map instead of Octave_map

diff -r f6b7b6e5b8b8 -r e9966851619b src/ChangeLog
--- a/src/ChangeLog	Wed Sep 29 03:09:19 2010 -0400
+++ b/src/ChangeLog	Wed Sep 29 03:19:37 2010 -0400
@@ -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.
diff -r f6b7b6e5b8b8 -r e9966851619b src/DLD-FUNCTIONS/getgrent.cc
--- a/src/DLD-FUNCTIONS/getgrent.cc	Wed Sep 29 03:09:19 2010 -0400
+++ b/src/DLD-FUNCTIONS/getgrent.cc	Wed Sep 29 03:19:37 2010 -0400
@@ -48,7 +48,7 @@
 
   if (gr)
     {
-      Octave_map m;
+      octave_scalar_map m;
 
       m.assign ("name", gr.name ());
       m.assign ("passwd", gr.passwd ());
diff -r f6b7b6e5b8b8 -r e9966851619b src/DLD-FUNCTIONS/getpwent.cc
--- a/src/DLD-FUNCTIONS/getpwent.cc	Wed Sep 29 03:09:19 2010 -0400
+++ b/src/DLD-FUNCTIONS/getpwent.cc	Wed Sep 29 03:19:37 2010 -0400
@@ -48,7 +48,7 @@
 
   if (pw)
     {
-      Octave_map m;
+      octave_scalar_map m;
 
       m.assign ("name", pw.name ());
       m.assign ("passwd", pw.passwd ());
diff -r f6b7b6e5b8b8 -r e9966851619b src/DLD-FUNCTIONS/getrusage.cc
--- a/src/DLD-FUNCTIONS/getrusage.cc	Wed Sep 29 03:09:19 2010 -0400
+++ b/src/DLD-FUNCTIONS/getrusage.cc	Wed Sep 29 03:19:37 2010 -0400
@@ -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)