Mercurial > hg > octave-nkf

diff src/ov-str-mat.cc @ 8345:c777f3ce02d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
smarter conversion lookup
author Jaroslav Hajek <highegg@gmail.com>
date Tue, 25 Nov 2008 14:04:55 +0100
parents dadf478ddc42
children 25bc2d31e1bf
line wrap: on
line diff
--- a/src/ov-str-mat.cc
+++ b/src/ov-str-mat.cc
@@ -66,21 +66,16 @@
 
   NDArray nda = v.array_value (true);
 
-  if (! error_state)
-    {
-      if (nda.numel () == 1)
-	retval = new octave_scalar (nda(0));
-      else
-	retval = new octave_matrix (nda);
-    }
+  if (! error_state) retval = new octave_matrix (nda);
 
   return retval;
 }
 
-octave_base_value::type_conv_fcn
+octave_base_value::type_conv_info
 octave_char_matrix_str::numeric_conversion_function (void) const
 {
-  return default_numeric_conversion_function;
+  return octave_base_value::type_conv_info (default_numeric_conversion_function,
+                                            octave_matrix::static_type_id ());
 }
 
 octave_value