Mercurial > octave-nkf

diff src/ov-complex.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 5719210fff4c
children 01e4957409a4
line wrap: on
line diff
--- a/src/ov-complex.cc	Wed Jul 09 18:28:41 2003 +0000
+++ b/src/ov-complex.cc	Wed Jul 09 19:09:09 2003 +0000
@@ -92,18 +92,10 @@
 {
   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 scalar", "real scalar");
 
-  if (flag)
-    retval = std::real (scalar);
-  else
-    gripe_invalid_conversion ("complex scalar", "real scalar");
+  retval = std::real (scalar);
 
   return retval;
 }
@@ -113,18 +105,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 scalar", "real matrix");
 
-  if (flag)
-    retval = Matrix (1, 1, std::real (scalar));
-  else
-    gripe_invalid_conversion ("complex scalar", "real matrix");
+  retval = Matrix (1, 1, std::real (scalar));
 
   return retval;
 }