diff options
| author |  Thomas Capricelli <orzel@freehackers.org> | 2010-03-27 18:58:29 +0100 |
|---|---|---|
| committer | Thomas Capricelli <orzel@freehackers.org> | 2010-03-27 18:58:29 +0100 |
| commit | 0a5c2d8a54bf0bdab7a7c68e824002ba163bbdca (patch) | |
| tree | d466a05a6dfc949a2701dc2575b1449dd476c324 | |
| parent | af08770890acdc6f78e9a4730c543b6bd1aadd3a (diff) | |
fix misc warnings, more importantly when NDEBUG is defined, assert() is a
nop.
| -rw-r--r-- | Eigen/src/Cholesky/LLT.h | 3 | ||||
| -rw-r--r-- | Eigen/src/Core/DenseBase.h | 2 | ||||
| -rw-r--r-- | Eigen/src/LU/PartialPivLU.h | 3 | ||||
| -rw-r--r-- | unsupported/Eigen/FFT | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/Eigen/src/Cholesky/LLT.h b/Eigen/src/Cholesky/LLT.h index d552e4e8a..e95b97016 100644 --- a/Eigen/src/Cholesky/LLT.h +++ b/Eigen/src/Cholesky/LLT.h @@ -296,8 +296,7 @@ template<typename Derived> bool LLT<MatrixType,_UpLo>::solveInPlace(MatrixBase<Derived> &bAndX) const { ei_assert(m_isInitialized && "LLT is not initialized."); - const int size = m_matrix.rows(); - ei_assert(size==bAndX.rows()); + ei_assert(m_matrix.rows()==bAndX.rows()); matrixL().solveInPlace(bAndX); matrixU().solveInPlace(bAndX); return true; diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index 29a95b8db..199d4aa98 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -584,7 +584,7 @@ template<typename Derived> class DenseBase #endif // disable the use of evalTo for dense objects with a nice compilation error - template<typename Dest> inline void evalTo(Dest& dst) const + template<typename Dest> inline void evalTo(Dest& ) const { EIGEN_STATIC_ASSERT((ei_is_same_type<Dest,void>::ret),THE_EVAL_EVALTO_FUNCTION_SHOULD_NEVER_BE_CALLED_FOR_DENSE_OBJECTS); } diff --git a/Eigen/src/LU/PartialPivLU.h b/Eigen/src/LU/PartialPivLU.h index 8ff9c5b03..61d59b8cb 100644 --- a/Eigen/src/LU/PartialPivLU.h +++ b/Eigen/src/LU/PartialPivLU.h @@ -439,8 +439,7 @@ struct ei_solve_retval<PartialPivLU<_MatrixType>, Rhs> * Step 3: replace c by the solution x to Ux = c. */ - const int size = dec().matrixLU().rows(); - ei_assert(rhs().rows() == size); + ei_assert(rhs().rows() == dec().matrixLU().rows()); // Step 1 dst = dec().permutationP() * rhs(); diff --git a/unsupported/Eigen/FFT b/unsupported/Eigen/FFT index 83f761028..23e0275b2 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 |