Mercurial > jwe > octave

comparison liboctave/numeric/Quad.h @ 21137:623fc7d08cc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Clean up compile warnings in liboctave from cset 7cac4e7458f2. * Sparse.h (range_error): Mark function with OCTAVE_NORETURN attribute. * Sparse.h (read_sparse_matrix): "return is" at end of fcn. * dSparse.cc (tinverse): Delete unused inverse_singular label. * idx-vector.h (as_array, sort_idx): Mark function with OCTAVE_NORETURN. * Quad.h (do_integrate): Mark unreachable do_integrate combinations with OCTAVE_NORETURN.
author Rik <rik@octave.org>
date Sat, 23 Jan 2016 17:44:57 -0800
parents f7084eae3318
children 2bb4e5a6290d
comparison
equal deleted inserted replaced
21136:7cac4e7458f2 21137:623fc7d08cc6
141 ~DefQuad (void) { } 141 ~DefQuad (void) { }
142 142
143 double do_integrate (octave_idx_type& ier, octave_idx_type& neval, 143 double do_integrate (octave_idx_type& ier, octave_idx_type& neval,
144 double& abserr); 144 double& abserr);
145 145
146 float do_integrate (octave_idx_type& ier, octave_idx_type& neval, 146 OCTAVE_NORETURN float do_integrate (octave_idx_type& ier,
147 float& abserr); 147 octave_idx_type& neval, float& abserr);
148 148
149 private: 149 private:
150 150
151 double lower_limit; 151 double lower_limit;
152 double upper_limit; 152 double upper_limit;
171 ~IndefQuad (void) { } 171 ~IndefQuad (void) { }
172 172
173 double do_integrate (octave_idx_type& ier, octave_idx_type& neval, 173 double do_integrate (octave_idx_type& ier, octave_idx_type& neval,
174 double& abserr); 174 double& abserr);
175 175
176 float do_integrate (octave_idx_type& ier, octave_idx_type& neval, 176 OCTAVE_NORETURN float do_integrate (octave_idx_type& ier,
177 float& abserr); 177 octave_idx_type& neval, float& abserr);
178 178
179 private: 179 private:
180 180
181 double bound; 181 double bound;
182 IntegralType type; 182 IntegralType type;
204 : Quad (fcn), lower_limit (0.0), upper_limit (1.0), 204 : Quad (fcn), lower_limit (0.0), upper_limit (1.0),
205 singularities (sing) { } 205 singularities (sing) { }
206 206
207 ~FloatDefQuad (void) { } 207 ~FloatDefQuad (void) { }
208 208
209 double do_integrate (octave_idx_type& ier, octave_idx_type& neval, 209 OCTAVE_NORETURN double do_integrate (octave_idx_type& ier,
210 double& abserr); 210 octave_idx_type& neval, double& abserr);
211 211
212 float do_integrate (octave_idx_type& ier, octave_idx_type& neval, 212 float do_integrate (octave_idx_type& ier, octave_idx_type& neval,
213 float& abserr); 213 float& abserr);
214 214
215 private: 215 private:
234 FloatIndefQuad (float_integrand_fcn fcn, double b, IntegralType t) 234 FloatIndefQuad (float_integrand_fcn fcn, double b, IntegralType t)
235 : Quad (fcn), bound (b), type (t), integration_error (0) { } 235 : Quad (fcn), bound (b), type (t), integration_error (0) { }
236 236
237 ~FloatIndefQuad (void) { } 237 ~FloatIndefQuad (void) { }
238 238
239 double do_integrate (octave_idx_type& ier, octave_idx_type& neval, 239 OCTAVE_NORETURN double do_integrate (octave_idx_type& ier,
240 double& abserr); 240 octave_idx_type& neval, double& abserr);
241 241
242 float do_integrate (octave_idx_type& ier, octave_idx_type& neval, 242 float do_integrate (octave_idx_type& ier, octave_idx_type& neval,
243 float& abserr); 243 float& abserr);
244 244
245 private: 245 private: