Mercurial > hg > octave-nkf

diff src/ov-str-mat.cc @ 5759:ce79d238f142

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-04-13 13:04:32 by jwe]
author jwe
date Thu, 13 Apr 2006 13:04:33 +0000
parents 65208d959bf1
children 8d7162924bd3
line wrap: on
line diff
--- a/src/ov-str-mat.cc
+++ b/src/ov-str-mat.cc
@@ -60,12 +60,12 @@
 //   octave> 'abc' + 0
 //   97 98 99
 //
-static bool Vwarn_str_to_num;
+static int Vwarn_str_to_num;
 
-static octave_value *
-default_numeric_conversion_function (const octave_value& a)
+static octave_base_value *
+default_numeric_conversion_function (const octave_base_value& a)
 {
-  octave_value *retval = 0;
+  octave_base_value *retval = 0;
 
   CAST_CONV_ARG (const octave_char_matrix_str&);
 
@@ -82,7 +82,7 @@
   return retval;
 }
 
-type_conv_fcn
+octave_base_value::type_conv_fcn
 octave_char_matrix_str::numeric_conversion_function (void) const
 {
   return default_numeric_conversion_function;
@@ -792,7 +792,6 @@
 @end defvr");
 }
 
-
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***