diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2012-02-06 15:57:51 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2012-02-06 15:57:51 +0100 |
| commit | 99c694623a5bf8ec3c3c6fbe9c044a09eb7dcd5b (patch) | |
| tree | 9b2ad8528ca1c97c6830e2ee3bd12bc6f7ca3da6 /Eigen/src/Core/SolveTriangular.h | |
| parent | 6ad48c5d92e168ccece5fc9c608d2f1fc8a4009d (diff) | |
fix a dozen of warnings with MSVC, and get rid of some useless throw()
Diffstat (limited to 'Eigen/src/Core/SolveTriangular.h')
| -rw-r--r-- | Eigen/src/Core/SolveTriangular.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Eigen/src/Core/SolveTriangular.h b/Eigen/src/Core/SolveTriangular.h index bd3cab328..def5116d5 100644 --- a/Eigen/src/Core/SolveTriangular.h +++ b/Eigen/src/Core/SolveTriangular.h @@ -177,10 +177,8 @@ template<int Side, typename OtherDerived> void TriangularView<MatrixType,Mode>::solveInPlace(const MatrixBase<OtherDerived>& _other) const { OtherDerived& other = _other.const_cast_derived(); - eigen_assert(cols() == rows()); - eigen_assert( (Side==OnTheLeft && cols() == other.rows()) || (Side==OnTheRight && cols() == other.cols()) ); - eigen_assert(!(Mode & ZeroDiag)); - eigen_assert(Mode & (Upper|Lower)); + eigen_assert( cols() == rows() && ((Side==OnTheLeft && cols() == other.rows()) || (Side==OnTheRight && cols() == other.cols())) ); + eigen_assert((!(Mode & ZeroDiag)) && bool(Mode & (Upper|Lower))); enum { copy = internal::traits<OtherDerived>::Flags & RowMajorBit && OtherDerived::IsVectorAtCompileTime }; typedef typename internal::conditional<copy, |