# HG changeset patch
# User jwe
# Date 1107936245 0
# Node ID 100f9c190be4d0e214d395ee767b6d0ebb9d2b90
# Parent  8eaef366ab4339a5d38ecb10bed50de716dda2a5
[project @ 2005-02-09 08:02:58 by jwe]

diff -r 8eaef366ab43 -r 100f9c190be4 liboctave/Array-util.cc
--- a/liboctave/Array-util.cc	Wed Feb 09 07:59:37 2005 +0000
+++ b/liboctave/Array-util.cc	Wed Feb 09 08:04:05 2005 +0000
@@ -208,8 +208,11 @@
 
   retval.resize (n);
 
+  static const char *tag[3] = { "row", "column", 0 };
+
   for (int i = 0; i < n; i++)
-    retval(i) = ra_idx(i).freeze (dimensions(i), "XXX FIXME XXX", resize_ok);
+    retval(i) = ra_idx(i).freeze (dimensions(i), tag[i < 2 ? i : 3],
+				  resize_ok);
 
   return retval;
 }
diff -r 8eaef366ab43 -r 100f9c190be4 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Wed Feb 09 07:59:37 2005 +0000
+++ b/liboctave/ChangeLog	Wed Feb 09 08:04:05 2005 +0000
@@ -1,3 +1,7 @@
+2005-02-08  John W. Eaton  <jwe@octave.org>
+
+	* Array-util.cc (freeze): Improve error message.
+
 2005-01-26  David Bateman <dbateman@free.fr>
 
 	* Array.cc (Array<T>::insert): Handle generic case, not just
diff -r 8eaef366ab43 -r 100f9c190be4 src/ChangeLog
--- a/src/ChangeLog	Wed Feb 09 07:59:37 2005 +0000
+++ b/src/ChangeLog	Wed Feb 09 08:04:05 2005 +0000
@@ -1,3 +1,7 @@
+2005-02-08  Walter Landry  <landry@osc.edu>
+
+	* symtab.h (symbol_record::mark_as_command): Avoid AIX compiler error.
+
 2005-02-07  John W. Eaton  <jwe@octave.org>
 
 	* DLD-FUNCTIONS/find.cc (find_nonzero_elem_idx): Return [] instead
diff -r 8eaef366ab43 -r 100f9c190be4 src/symtab.h
--- a/src/symtab.h	Wed Feb 09 07:59:37 2005 +0000
+++ b/src/symtab.h	Wed Feb 09 08:04:05 2005 +0000
@@ -116,8 +116,9 @@
     bool is_user_variable (void) const
       { return (symbol_type & symbol_record::USER_VARIABLE); }
 
+    // Don't use |= here to avoid error with AIX compiler.
     void mark_as_command (void)
-      { symbol_type |= symbol_record::COMMAND; }
+      { symbol_type = symbol_type | symbol_record::COMMAND; }
 
     void unmark_command (void)
       { symbol_type &= ~symbol_record::COMMAND; }