Mercurial > octave-nkf
changeset 7941:f8cab9eeb128
Fix NDArray compilation/export
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 17 Jul 2008 10:56:22 -0400 |
| parents | 1bfb88e78027 |
| children | db6478d9c669 |
| files | liboctave/ChangeLog liboctave/dNDArray.cc |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Thu Jul 17 10:55:50 2008 -0400 +++ b/liboctave/ChangeLog Thu Jul 17 10:56:22 2008 -0400 @@ -1,3 +1,8 @@ +2008-07-17 Michael Goffioul <michael.goffioul@gmail.com> + + * dNDArray.cc: Do not include ctor NDArray(Array<octave_idx_type>, + bool, bool) into conditional HAVE_FFTW3 preprocessor statement. + 2008-07-16 John W. Eaton <jwe@octave.org> * oct-mutex.h (octave_autolock::octave_autolock (void),
--- a/liboctave/dNDArray.cc Thu Jul 17 10:55:50 2008 -0400 +++ b/liboctave/dNDArray.cc Thu Jul 17 10:56:22 2008 -0400 @@ -40,6 +40,7 @@ #if defined (HAVE_FFTW3) #include "oct-fftw.h" +#endif NDArray::NDArray (const Array<octave_idx_type>& a, bool zero_based, bool negative_to_nan) @@ -83,6 +84,8 @@ } } +#if defined (HAVE_FFTW3) + ComplexNDArray NDArray::fourier (int dim) const {