diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2011-08-19 14:18:05 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2011-08-19 14:18:05 +0200 |
| commit | 42e2578ef9fcbb62ad6e07933ccf531f6f7cd1b3 (patch) | |
| tree | 90cef174284cad35f0d13d4b991db83335554caf /unsupported/Eigen/FFT | |
| parent | 5734ee6df42991e59609ffd26aaeb3c7aacd61e2 (diff) | |
the min/max macros to detect unprotected min/max were undefined by some std header,
so let's declare them after and do the respective fixes ;)
Diffstat (limited to 'unsupported/Eigen/FFT')
| -rw-r--r-- | unsupported/Eigen/FFT | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unsupported/Eigen/FFT b/unsupported/Eigen/FFT index 0b2823058..c56bd63d6 100644 --- a/unsupported/Eigen/FFT +++ b/unsupported/Eigen/FFT @@ -331,7 +331,7 @@ class FFT // if the vector is strided, then we need to copy it to a packed temporary Matrix<src_type,1,Dynamic> tmp; if ( resize_input ) { - size_t ncopy = std::min(src.size(),src.size() + resize_input); + size_t ncopy = (std::min)(src.size(),src.size() + resize_input); tmp.setZero(src.size() + resize_input); if ( realfft && HasFlag(HalfSpectrum) ) { // pad at the Nyquist bin |