Mercurial > jwe > octave

comparison libinterp/octave-value/ov-flt-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
comparison
equal deleted inserted replaced
21119:90cd0f9442d5 21120:499b851fbfae
134 134
135 bool bool_value (bool warn = false) const 135 bool bool_value (bool warn = false) const
136 { 136 {
137 if (xisnan (scalar)) 137 if (xisnan (scalar))
138 err_nan_to_logical_conversion (); 138 err_nan_to_logical_conversion ();
139 else if (warn && scalar != 0.0f && scalar != 1.0f) 139 if (warn && scalar != 0.0f && scalar != 1.0f)
140 warn_logical_conversion (); 140 warn_logical_conversion ();
141 141
142 return scalar != 0.0f; 142 return scalar != 0.0f;
143 } 143 }
144 144
145 boolNDArray bool_array_value (bool warn = false) const 145 boolNDArray bool_array_value (bool warn = false) const
146 { 146 {
147 if (xisnan (scalar)) 147 if (xisnan (scalar))
148 err_nan_to_logical_conversion (); 148 err_nan_to_logical_conversion ();
149 else if (warn && scalar != 0.0f && scalar != 1.0f) 149 if (warn && scalar != 0.0f && scalar != 1.0f)
150 warn_logical_conversion (); 150 warn_logical_conversion ();
151 151
152 return boolNDArray (dim_vector (1, 1), scalar != 1.0f); 152 return boolNDArray (dim_vector (1, 1), scalar != 1.0f);
153 } 153 }
154 154