Mercurial > octave-nkf

diff src/ov-ch-mat.cc @ 5781:faafc2d98b8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-05-02 19:40:19 by jwe]
author jwe
date Tue, 02 May 2006 19:40:21 +0000
parents ace8d8d26933
children c20eb7330d13
line wrap: on
line diff
--- a/src/ov-ch-mat.cc	Thu Apr 27 20:03:48 2006 +0000
+++ b/src/ov-ch-mat.cc	Tue May 02 19:40:21 2006 +0000
@@ -57,12 +57,10 @@
 {
   double retval = lo_ieee_nan_value ();
 
-  // FIXME -- maybe this should be a function, valid_as_scalar()
   if (rows () > 0 && columns () > 0)
     {
-      // FIXME -- is warn_fortran_indexing the right variable here?
-      if (Vwarn_fortran_indexing)
-	gripe_implicit_conversion ("character matrix", "real scalar");
+      gripe_implicit_conversion ("Octave:array-as-scalar",
+				 "character matrix", "real scalar");
 
       retval = matrix (0, 0);
     }
@@ -79,12 +77,10 @@
 
   Complex retval (tmp, tmp);
 
-  // FIXME -- maybe this should be a function, valid_as_scalar()
   if (rows () > 0 && columns () > 0)
     {
-      // FIXME -- is warn_fortran_indexing the right variable here?
-      if (Vwarn_fortran_indexing)
-	gripe_implicit_conversion ("character matrix", "complex scalar");
+      gripe_implicit_conversion ("Octave:array-as-scalar",
+				 "character matrix", "complex scalar");
 
       retval = matrix (0, 0);
     }