Mercurial > jwe > octave

diff libinterp/octave-value/ov-complex.h @ 21120:499b851fbfae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace pattern if/err_XXX/else/code with if/err_XXX/ code. * schur.cc, ov-complex.h, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.h, ov-flt-complex.h, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.h, ov-str-mat.cc, ops.h, pt-idx.cc, Array.cc, CColVector.cc, CMatrix.cc, CRowVector.cc, MSparse.cc, PermMatrix.cc, Sparse.cc, dColVector.cc, dMatrix.cc, dRowVector.cc, dSparse.cc, fCColVector.cc, fCMatrix.cc, fCRowVector.cc, fColVector.cc, fMatrix.cc, fRowVector.cc: Replace pattern if/err_XXX/else/code with if/err_XXX/ code.
author Rik <rik@octave.org>
date Wed, 20 Jan 2016 16:58:59 -0800
parents e39e05d90788
children 1473547f50f5
line wrap: on
line diff
--- a/libinterp/octave-value/ov-complex.h	Wed Jan 20 16:10:23 2016 -0800
+++ b/libinterp/octave-value/ov-complex.h	Wed Jan 20 16:58:59 2016 -0800
@@ -140,7 +140,7 @@
   {
     if (xisnan (scalar))
       err_nan_to_logical_conversion ();
-    else if (warn && scalar != 0.0 && scalar != 1.0)
+    if (warn && scalar != 0.0 && scalar != 1.0)
       warn_logical_conversion ();
 
     return scalar != 0.0;
@@ -150,7 +150,7 @@
   {
     if (xisnan (scalar))
       err_nan_to_logical_conversion ();
-    else if (warn && scalar != 0.0 && scalar != 1.0)
+    if (warn && scalar != 0.0 && scalar != 1.0)
       warn_logical_conversion ();
 
     return boolNDArray (dim_vector (1, 1), scalar != 0.0);