Mercurial > octave-nkf

comparison libinterp/operators/op-fcs-fs.cc @ 19772:9155bab86647

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use 0.0f style constants instead of static_cast<float> (0.0) * data.cc, det.cc, op-fcm-fcs.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fm-fcs.cc, op-fs-fcs.cc, fCDiagMatrix.cc, lo-mappers.cc, mx-ops: Use 0.0f style constants instead of static_cast<float> (0.0).
author John W. Eaton <jwe@octave.org>
date Tue, 17 Feb 2015 16:30:52 -0500
parents 4197fc428c7d
children
comparison
equal deleted inserted replaced
19771:8c2b30cb6001 19772:9155bab86647
62 { 62 {
63 CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); 63 CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&);
64 64
65 FloatComplex d = v1.float_complex_value (); 65 FloatComplex d = v1.float_complex_value ();
66 66
67 if (d == static_cast<float>(0.0)) 67 if (d == 0.0f)
68 gripe_divide_by_zero (); 68 gripe_divide_by_zero ();
69 69
70 return octave_value (v2.float_value () / d); 70 return octave_value (v2.float_value () / d);
71 } 71 }
72 72
97 { 97 {
98 CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); 98 CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&);
99 99
100 FloatComplex d = v1.float_complex_value (); 100 FloatComplex d = v1.float_complex_value ();
101 101
102 if (d == static_cast<float>(0.0)) 102 if (d == 0.0f)
103 gripe_divide_by_zero (); 103 gripe_divide_by_zero ();
104 104
105 return octave_value (v2.float_value () / d); 105 return octave_value (v2.float_value () / d);
106 } 106 }
107 107
108 DEFBINOP (el_and, float_complex, float) 108 DEFBINOP (el_and, float_complex, float)
109 { 109 {
110 CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); 110 CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&);
111 111
112 return (v1.float_complex_value () != static_cast<float>(0.0) && 112 return (v1.float_complex_value () != 0.0f && v2.float_value ());
113 v2.float_value ());
114 } 113 }
115 114
116 DEFBINOP (el_or, float_complex, float) 115 DEFBINOP (el_or, float_complex, float)
117 { 116 {
118 CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); 117 CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&);
119 118
120 return (v1.float_complex_value () != static_cast<float>(0.0) || 119 return (v1.float_complex_value () != 0.0f || v2.float_value ());
121 v2.float_value ());
122 } 120 }
123 121
124 DEFNDCATOP_FN (fcs_fs, float_complex, float_scalar, float_complex_array, 122 DEFNDCATOP_FN (fcs_fs, float_complex, float_scalar, float_complex_array,
125 float_array, concat) 123 float_array, concat)
126 124