# HG changeset patch
# User jwe
# Date 1075746669 0
# Node ID c88afb778c4102096e1958167089762f082ffc75
# Parent  2ae4a2695ab61a627433179e91168c40a0280bde
[project @ 2004-02-02 18:31:09 by jwe]

diff -r 2ae4a2695ab6 -r c88afb778c41 liboctave/Array-flags.cc
--- a/liboctave/Array-flags.cc	Fri Jan 30 20:28:34 2004 +0000
+++ b/liboctave/Array-flags.cc	Mon Feb 02 18:31:09 2004 +0000
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include "Array.h"
+#include "Array-flags.h"
 
 // These have to be defined somewhere, but only once.
 
diff -r 2ae4a2695ab6 -r c88afb778c41 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Fri Jan 30 20:28:34 2004 +0000
+++ b/liboctave/ChangeLog	Mon Feb 02 18:31:09 2004 +0000
@@ -1,3 +1,12 @@
+2004-02-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* boolNDArray.h (boolNDArray::boolNDArray): Declare dim_vector
+	reference arg const.
+
+2004-01-30  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Array-flags.cc: Include Array-flags.h, not Array.h.  Doh.
+
 2004-01-30  Jakub Bogusz  <qboosh@pld-linux.org>
 
 	* Array-flags.h (liboctave_wfi_flag, liboctave_wrore_flag):
diff -r 2ae4a2695ab6 -r c88afb778c41 liboctave/boolNDArray.h
--- a/liboctave/boolNDArray.h	Fri Jan 30 20:28:34 2004 +0000
+++ b/liboctave/boolNDArray.h	Mon Feb 02 18:31:09 2004 +0000
@@ -45,9 +45,9 @@
   
   boolNDArray (void) : ArrayN<bool> () { }
 
-  boolNDArray (dim_vector& dv) : ArrayN<bool> (dv) { }
+  boolNDArray (const dim_vector& dv) : ArrayN<bool> (dv) { }
 
-  boolNDArray (dim_vector& dv, const bool& val)
+  boolNDArray (const dim_vector& dv, const bool& val)
     : ArrayN<bool> (dv, val) { }
   
   boolNDArray (const boolNDArray& a) : ArrayN<bool> (a) { }
diff -r 2ae4a2695ab6 -r c88afb778c41 liboctave/kpse.cc
--- a/liboctave/kpse.cc	Fri Jan 30 20:28:34 2004 +0000
+++ b/liboctave/kpse.cc	Mon Feb 02 18:31:09 2004 +0000
@@ -343,7 +343,7 @@
 static void
 xfclose (FILE *f, const std::string& filename)
 {
-  assert (f);
+  assert (f != 0);
 
   if (! fclose (f))
     FATAL_PERROR (filename.c_str ());
diff -r 2ae4a2695ab6 -r c88afb778c41 src/ChangeLog
--- a/src/ChangeLog	Fri Jan 30 20:28:34 2004 +0000
+++ b/src/ChangeLog	Mon Feb 02 18:31:09 2004 +0000
@@ -1,3 +1,8 @@
+2004-02-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* oct-map.cc (Octave_map::assign (const std::string, const Cell&)):
+	Set dimensions to RHS dimensions, not 1x1.
+
 2004-01-23  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* ov-bool.cc, ov-cx-mat.cc, ov-re-mat.cc, ov-str-mat.cc:
@@ -1598,7 +1603,7 @@
 	not OCTAVE_VERSION.  Mismatch is now fatal.
 	* defun-int.h (DEFINE_FUN_INSTALLER_FUN3): Pass
 	OCTAVE_API_VERSION instead of OCTAVE_VERSION to check_version.
-	* version.h (OCTAVE_API_VERSION): New macro.
+	* version.h (OCTAVE_API_VERSION): New macro, initial value api-v1.
 
 	* defaults.cc (Vdefault_exec_path): New static variable.
 	(set_default_default_exec_path): New function.
@@ -1617,6 +1622,10 @@
 	* toplev.cc (octave_config_info): Key for OCTAVE_CONF_DEFS should
 	be DEFS, not UGLY_DEFS.
 
+2003-06-27  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* version.h (OCTAVE_VERSION): Now 2.1.50.
+
 2003-06-26  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* variables.cc (symbol_exist): Distinguish between user and dld
@@ -1693,6 +1702,10 @@
 	(gnuplot_has_multiplot): Delete.
 	(symbols_of_pt_plot): Delete DEFVAR for gnuplot_has_multiplot.
 
+2003-05-28  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* version.h (OCTAVE_VERSION): Now 2.1.49.
+
 2003-05-28  Teemu Ikonen <tpikonen@pcu.helsinki.fi>
 
 	* load-save.cc (save_mat5_binary_element, save_mat_binary_data):
@@ -1723,6 +1736,14 @@
 	* lex.l: Use yyunput (X, yytext) instead of unput (X) for newer
 	versions of flex.
 
+2003-05-06  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* version.h (OCTAVE_VERSION): Now 2.1.48.
+
+2003-05-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* version.h (OCTAVE_VERSION): Now 2.1.47.
+
 2003-05-01  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* load-save.cc (save_ascii_data): If saving a range with
diff -r 2ae4a2695ab6 -r c88afb778c41 src/ls-oct-binary.cc
--- a/src/ls-oct-binary.cc	Fri Jan 30 20:28:34 2004 +0000
+++ b/src/ls-oct-binary.cc	Mon Feb 02 18:31:09 2004 +0000
@@ -282,7 +282,7 @@
   os.write (X_CAST (char *, &doc_len), 4);
   os << doc;
 
-  char tmp;
+  unsigned char tmp;
 
   tmp = mark_as_global;
   os.write (X_CAST (char *, &tmp), 1);
diff -r 2ae4a2695ab6 -r c88afb778c41 src/oct-map.cc
--- a/src/oct-map.cc	Fri Jan 30 20:28:34 2004 +0000
+++ b/src/oct-map.cc	Mon Feb 02 18:31:09 2004 +0000
@@ -235,7 +235,7 @@
     {
       map[k] = rhs;
 
-      dimensions = dim_vector (1, 1);
+      dimensions = rhs.dims ();
     }
   else
     {