diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-04-16 11:25:50 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-04-16 11:25:50 -0400 |
| commit | 0ab431d7b860afc6766c7c20f7bb39a1d71bff62 (patch) | |
| tree | f8da6ce3cc7738735f315f7954bbbabf48e0c621 /unsupported/Eigen/FFT | |
| parent | ff6a46105d86e92753858c1b2aea8bcaf4575819 (diff) | |
| parent | ea1a2df37092f88f5594dfea1f7e4996dd8e612d (diff) | |
* merge with mainline
* adapt Eigenvalues module to the new rule that the RowMajorBit must have the proper value for vectors
* Fix RowMajorBit in ei_traits<ProductBase>
* Fix vectorizability logic in CoeffBasedProduct
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 045c44611..2a1e21007 100644 --- a/unsupported/Eigen/FFT +++ b/unsupported/Eigen/FFT @@ -320,7 +320,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 = 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 |