# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1234777210 -3600
# Node ID 900a5bf52309616de76cfbbb181db59db6dcb1f6
# Parent  c141078e083abc81e59bde195a34e61ceb6aac21
Fix invalid conversion error on implicit demotion of n-d arrays

diff -r c141078e083a -r 900a5bf52309 src/ChangeLog
--- a/src/ChangeLog	Mon Feb 16 10:31:10 2009 +0100
+++ b/src/ChangeLog	Mon Feb 16 10:40:10 2009 +0100
@@ -1,7 +1,9 @@
 2009-02-16  Jaroslav Hajek  <highegg@gmail.com>
 
-	* ov-base-mat (octave_base_matrix<MT>::assign (const octave_value_list&,
+	* ov-base-mat.cc (octave_base_matrix<MT>::assign (const octave_value_list&,
 	typename MT::element_type): Fix invalid index.
+	* ov-re-mat.cc (default_numeric_demotion_function): Use
+	float_array_value instead of float_matrix_value.
 
 2009-02-16  John W. Eaton  <jwe@octave.org>
 
diff -r c141078e083a -r 900a5bf52309 src/ov-re-mat.cc
--- a/src/ov-re-mat.cc	Mon Feb 16 10:31:10 2009 +0100
+++ b/src/ov-re-mat.cc	Mon Feb 16 10:40:10 2009 +0100
@@ -82,7 +82,7 @@
 {
   CAST_CONV_ARG (const octave_matrix&);
 
-  return new octave_float_matrix (v.float_matrix_value ());
+  return new octave_float_matrix (v.float_array_value ());
 }
 
 octave_base_value::type_conv_info