diff options
| -rw-r--r-- | cmake/EigenTesting.cmake | 2 | ||||
| -rw-r--r-- | unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h | 4 | ||||
| -rw-r--r-- | unsupported/test/FFT.cpp | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake index ce567abc3..c1fd49e20 100644 --- a/cmake/EigenTesting.cmake +++ b/cmake/EigenTesting.cmake @@ -223,7 +223,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(COVERAGE_FLAGS "") endif(EIGEN_COVERAGE_TESTING) if(EIGEN_TEST_RVALUE_REF_SUPPORT OR EIGEN_TEST_C++0x) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") endif(EIGEN_TEST_RVALUE_REF_SUPPORT OR EIGEN_TEST_C++0x) if(CMAKE_SYSTEM_NAME MATCHES Linux) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_FLAGS} -g2") diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h b/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h index 636f37655..6510b6814 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h @@ -272,7 +272,7 @@ void MatrixExponential<MatrixType>::computeUV(float) } else { const float maxnorm = 3.925724783138660f; m_squarings = std::max(0, (int)ceil(log2(m_l1norm / maxnorm))); - MatrixType A = *m_M / std::pow(Scalar(2), m_squarings); + MatrixType A = *m_M / std::pow(Scalar(2), Scalar(m_squarings)); pade7(A); } } @@ -291,7 +291,7 @@ void MatrixExponential<MatrixType>::computeUV(double) } else { const double maxnorm = 5.371920351148152; m_squarings = std::max(0, (int)ceil(log2(m_l1norm / maxnorm))); - MatrixType A = *m_M / std::pow(Scalar(2), m_squarings); + MatrixType A = *m_M / std::pow(Scalar(2), Scalar(m_squarings)); pade13(A); } } diff --git a/unsupported/test/FFT.cpp b/unsupported/test/FFT.cpp index ad0d426e4..861677174 100644 --- a/unsupported/test/FFT.cpp +++ b/unsupported/test/FFT.cpp @@ -47,7 +47,11 @@ complex<long double> promote(long double x) { return complex<long double>( x); cerr <<"idx\ttruth\t\tvalue\t|dif|=\n"; for (size_t k0=0;k0<size_t(fftbuf.size());++k0) { complex<long double> acc = 0; +#ifdef _GNU_SOURCE long double phinc = -2.*k0* M_PIl / timebuf.size(); +#else + long double phinc = -2.*k0* M_PI / timebuf.size(); +#endif for (size_t k1=0;k1<size_t(timebuf.size());++k1) { acc += promote( timebuf[k1] ) * exp( complex<long double>(0,k1*phinc) ); } |