From 42e2578ef9fcbb62ad6e07933ccf531f6f7cd1b3 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 19 Aug 2011 14:18:05 +0200 Subject: 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 ;) --- unsupported/Eigen/FFT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unsupported/Eigen/FFT') 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 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 -- cgit v1.2.3