Mercurial > hg > octave-avbm

diff src/ov-cx-mat.cc @ 4451:ea1d3e1a4b1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-07-09 19:09:09 by jwe]
author jwe
date Wed, 09 Jul 2003 19:09:09 +0000
parents c57f599bf7ea
children abbf63293766
line wrap: on
line diff
--- a/src/ov-cx-mat.cc
+++ b/src/ov-cx-mat.cc
@@ -132,22 +132,12 @@
 {
   double retval = lo_ieee_nan_value ();
 
-  int flag = force_conversion;
-
-  if (! flag)
-    flag = Vok_to_lose_imaginary_part;
-
-  if (flag < 0)
+  if (! force_conversion && Vwarn_imag_to_real)
     gripe_implicit_conversion ("complex matrix", "real scalar");
 
-  if (flag)
-    {
-      if ((rows () == 1 && columns () == 1)
-	  || (Vdo_fortran_indexing && rows () > 0 && columns () > 0))
-	retval = std::real (matrix (0, 0));
-      else
-	gripe_invalid_conversion ("complex matrix", "real scalar");
-    }
+  if ((rows () == 1 && columns () == 1)
+      || (Vdo_fortran_indexing && rows () > 0 && columns () > 0))
+    retval = std::real (matrix (0, 0));
   else
     gripe_invalid_conversion ("complex matrix", "real scalar");
 
@@ -159,18 +149,10 @@
 {
   Matrix retval;
 
-  int flag = force_conversion;
-
-  if (! flag)
-    flag = Vok_to_lose_imaginary_part;
-
-  if (flag < 0)
+  if (! force_conversion && Vwarn_imag_to_real)
     gripe_implicit_conversion ("complex matrix", "real matrix");
 
-  if (flag)
-    retval = ::real (matrix);
-  else
-    gripe_invalid_conversion ("complex matrix", "real matrix");
+  retval = ::real (matrix);
 
   return retval;
 }