comparison libinterp/corefcn/quadcc.cc @ 19630:0e1f5a750d00

maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Jan 2015 10:24:46 -0500
parents 65554f5847ac 446c46af4b42
children 4197fc428c7d
comparison
equal deleted inserted replaced
19626:37d37297acf8 19630:0e1f5a750d00
1641 else 1641 else
1642 { 1642 {
1643 nivals = 1 + args(4).numel (); 1643 nivals = 1 + args(4).numel ();
1644 } 1644 }
1645 1645
1646 int cquad_heapsize = (nivals >= min_cquad_heapsize ? nivals + 1 1646 int cquad_heapsize = (nivals >= min_cquad_heapsize ? nivals + 1
1647 : min_cquad_heapsize); 1647 : min_cquad_heapsize);
1648 /* The interval heap. */ 1648 /* The interval heap. */
1649 OCTAVE_LOCAL_BUFFER (cquad_ival, ivals, cquad_heapsize); 1649 OCTAVE_LOCAL_BUFFER (cquad_ival, ivals, cquad_heapsize);
1650 OCTAVE_LOCAL_BUFFER (double, iivals, cquad_heapsize); 1650 OCTAVE_LOCAL_BUFFER (double, iivals, cquad_heapsize);
1651 OCTAVE_LOCAL_BUFFER (int, heap, cquad_heapsize); 1651 OCTAVE_LOCAL_BUFFER (int, heap, cquad_heapsize);