Mercurial > hg > octave-nkf
diff liboctave/Quad.cc @ 10350:12884915a8e4
merge MArray classes & improve Array interface
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Sat, 23 Jan 2010 21:41:03 +0100 |
| parents | 07ebe522dac2 |
| children | 141b3fb5cef7 |
line wrap: on
line diff
--- a/liboctave/Quad.cc +++ b/liboctave/Quad.cc @@ -126,11 +126,11 @@ double result = 0.0; octave_idx_type leniw = 183*npts - 122; - Array<octave_idx_type> iwork (leniw); + Array<octave_idx_type> iwork (leniw, 1); octave_idx_type *piwork = iwork.fortran_vec (); octave_idx_type lenw = 2*leniw - npts; - Array<double> work (lenw); + Array<double> work (lenw, 1); double *pwork = work.fortran_vec (); user_fcn = f; @@ -160,11 +160,11 @@ double result = 0.0; octave_idx_type leniw = 128; - Array<octave_idx_type> iwork (leniw); + Array<octave_idx_type> iwork (leniw, 1); octave_idx_type *piwork = iwork.fortran_vec (); octave_idx_type lenw = 8*leniw; - Array<double> work (lenw); + Array<double> work (lenw, 1); double *pwork = work.fortran_vec (); user_fcn = f; @@ -222,11 +222,11 @@ float result = 0.0; octave_idx_type leniw = 183*npts - 122; - Array<octave_idx_type> iwork (leniw); + Array<octave_idx_type> iwork (leniw, 1); octave_idx_type *piwork = iwork.fortran_vec (); octave_idx_type lenw = 2*leniw - npts; - Array<float> work (lenw); + Array<float> work (lenw, 1); float *pwork = work.fortran_vec (); float_user_fcn = ff; @@ -256,11 +256,11 @@ float result = 0.0; octave_idx_type leniw = 128; - Array<octave_idx_type> iwork (leniw); + Array<octave_idx_type> iwork (leniw, 1); octave_idx_type *piwork = iwork.fortran_vec (); octave_idx_type lenw = 8*leniw; - Array<float> work (lenw); + Array<float> work (lenw, 1); float *pwork = work.fortran_vec (); float_user_fcn = ff;