diff options
| -rw-r--r-- | Eigen/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Eigen/Cholesky | 4 | ||||
| -rw-r--r-- | Eigen/LU | 4 | ||||
| -rw-r--r-- | Eigen/QR | 4 | ||||
| -rw-r--r-- | Eigen/src/Core/MathFunctions.h | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/Eigen/CMakeLists.txt b/Eigen/CMakeLists.txt index fba8219a0..773344119 100644 --- a/Eigen/CMakeLists.txt +++ b/Eigen/CMakeLists.txt @@ -1,4 +1,4 @@ -FILE(GLOB Eigen_SRCS "*.h") +SET(Eigen_SRCS Core CoreDeclarations LU Cholesky QR) SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/eigen2" diff --git a/Eigen/Cholesky b/Eigen/Cholesky index 73b0607d8..448dd506f 100644 --- a/Eigen/Cholesky +++ b/Eigen/Cholesky @@ -5,8 +5,8 @@ namespace Eigen { -#include "Eigen/src/Cholesky/Cholesky.h" -#include "Eigen/src/Cholesky/CholeskyWithoutSquareRoot.h" +#include "src/Cholesky/Cholesky.h" +#include "src/Cholesky/CholeskyWithoutSquareRoot.h" } // namespace Eigen @@ -5,8 +5,8 @@ namespace Eigen { -#include "Eigen/src/LU/Determinant.h" -#include "Eigen/src/LU/Inverse.h" +#include "src/LU/Determinant.h" +#include "src/LU/Inverse.h" } // namespace Eigen @@ -5,8 +5,8 @@ namespace Eigen { -#include "Eigen/src/QR/QR.h" -#include "Eigen/src/QR/EigenSolver.h" +#include "src/QR/QR.h" +#include "src/QR/EigenSolver.h" } // namespace Eigen diff --git a/Eigen/src/Core/MathFunctions.h b/Eigen/src/Core/MathFunctions.h index 557b93f56..8aa36bd1d 100644 --- a/Eigen/src/Core/MathFunctions.h +++ b/Eigen/src/Core/MathFunctions.h @@ -46,10 +46,10 @@ inline int ei_log(int) { ei_assert(false); return 0; } inline int ei_sin(int) { ei_assert(false); return 0; } inline int ei_cos(int) { ei_assert(false); return 0; } -#if (!(EIGEN_GNUC_AT_LEAST(4,3))) -inline int ei_pow(int x, int y) { return int(std::pow(double(x), y)); } -#else +#if EIGEN_GNUC_AT_LEAST(4,3) inline int ei_pow(int x, int y) { return std::pow(x, y); } +#else +inline int ei_pow(int x, int y) { return int(std::pow(double(x), y)); } #endif template<> inline int ei_random(int a, int b) |