Mercurial > octave-nkf

diff src/ov-str-mat.cc @ 4452:f3c21a1d1c62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-07-09 23:20:18 by jwe]
author jwe
date Wed, 09 Jul 2003 23:20:19 +0000
parents 83d4452bc522
children d7d9ca19960a
line wrap: on
line diff
--- a/src/ov-str-mat.cc	Wed Jul 09 19:09:09 2003 +0000
+++ b/src/ov-str-mat.cc	Wed Jul 09 23:20:19 2003 +0000
@@ -152,18 +152,10 @@
 {
   Matrix retval;
 
-  int flag = force_string_conv;
-
-  if (! flag)
-    flag = Vimplicit_str_to_num_ok;
-
-  if (flag < 0)
+  if (! force_string_conv && Vwarn_str_to_num)
     gripe_implicit_conversion ("string", "real matrix");
 
-  if (flag)
-    retval = Matrix (matrix);
-  else
-    gripe_invalid_conversion ("string", "real matrix");
+  retval = Matrix (matrix);
 
   return retval;
 }