Mercurial > hg > octave-lyh
changeset 4792:d2038299c683
[project @ 2004-02-20 18:44:43 by jwe]
| author | jwe |
|---|---|
| date | Fri, 20 Feb 2004 18:44:43 +0000 |
| parents | 62f2fb593455 |
| children | a62215ab8a03 |
| files | src/DLD-FUNCTIONS/fftw_wisdom.cc src/ov-fcn.h src/ov-range.cc src/ov-range.h src/ov-struct.cc |
| diffstat | 5 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/fftw_wisdom.cc +++ b/src/DLD-FUNCTIONS/fftw_wisdom.cc @@ -86,8 +86,6 @@ { octave_value retval; -#if defined (HAVE_FFTW3) - int nargin = args.length(); if (nargin < 1 || nargin > 2) @@ -96,6 +94,8 @@ return retval; } +#if defined (HAVE_FFTW3) + if (args(0).is_string ()) { bool overwrite = false;
--- a/src/ov-fcn.h +++ b/src/ov-fcn.h @@ -86,7 +86,7 @@ virtual bool takes_var_return (void) const { return false; } - virtual void octave_vr_val (const octave_value& val) { } + virtual void octave_vr_val (const octave_value&) { } virtual bool has_varargout (void) const { return false; }
--- a/src/ov-range.cc +++ b/src/ov-range.cc @@ -379,11 +379,11 @@ octave_range::save_hdf5 (hid_t loc_id, const char *name, bool /* save_as_floats */) { - hsize_t dims[3]; + hsize_t dimens[3]; hid_t space_hid = -1, type_hid = -1, data_hid = -1; bool retval = true; - space_hid = H5Screate_simple (0, dims, (hsize_t*) 0); + space_hid = H5Screate_simple (0, dimens, (hsize_t*) 0); if (space_hid < 0) return false; type_hid = hdf5_make_range_type (H5T_NATIVE_DOUBLE);
--- a/src/ov-range.h +++ b/src/ov-range.h @@ -108,7 +108,7 @@ return dim_vector (n > 0, n); } - size_t byte_size (void) const { 3 * sizeof (double); } + size_t byte_size (void) const { return 3 * sizeof (double); } octave_value reshape (const dim_vector& new_dims) const { return NDArray (matrix_value().reshape (new_dims)); }