Mercurial > octave-nkf

comparison libinterp/corefcn/jit-typeinfo.cc @ 20649:d35201e5ce5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation of jit broken by dd6345fd8a97 (bug #46191). * jit-typeinfo.cc (octave_jit_compute_nelem): Use rng.numel() rather than deprecated nelem(). * jit-typeinfo.cc (octave_jit_ginvalid_index): Call gripe_invalid_index (-1) now that 0-argument form of function has been removed. * jit-typeinfo.h (jit_range): Use numel() rather than nelem() for Range. * pt-jit.cc (trip_count): Use numel() rather than nelem() for Range.
author Rik <rik@octave.org>
date Mon, 12 Oct 2015 16:08:12 -0700
parents b70cc4bd8109
children b65888ec820e
comparison
equal deleted inserted replaced
20648:27c091f4b66d 20649:d35201e5ce5d
113 113
114 extern "C" octave_idx_type 114 extern "C" octave_idx_type
115 octave_jit_compute_nelem (double base, double limit, double inc) 115 octave_jit_compute_nelem (double base, double limit, double inc)
116 { 116 {
117 Range rng = Range (base, limit, inc); 117 Range rng = Range (base, limit, inc);
118 return rng.nelem (); 118 return rng.numel ();
119 } 119 }
120 120
121 extern "C" void 121 extern "C" void
122 octave_jit_release_any (octave_base_value *obv) 122 octave_jit_release_any (octave_base_value *obv)
123 { 123 {
219 } 219 }
220 220
221 extern "C" void 221 extern "C" void
222 octave_jit_ginvalid_index (void) 222 octave_jit_ginvalid_index (void)
223 { 223 {
224 gripe_invalid_index (); 224 // FIXME: 0-argument form of gripe_invalid_index removed in cset dd6345fd8a97
225 // Report -1 as the bad index for all occurrences.
226 gripe_invalid_index (-1);
225 } 227 }
226 228
227 extern "C" void 229 extern "C" void
228 octave_jit_gindex_range (int nd, int dim, octave_idx_type iext, 230 octave_jit_gindex_range (int nd, int dim, octave_idx_type iext,
229 octave_idx_type ext) 231 octave_idx_type ext)