diff options
| author |  Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2016-05-11 23:50:13 +0200 |
|---|---|---|
| committer | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2016-05-11 23:50:13 +0200 |
| commit | 131e5a1a4a50b11b386dd8aa3408d3baa1e9d1b5 (patch) | |
| tree | bb0ed4ec3823f2a03803a54223916606e2aad1ec /Eigen/src/Core/SolveTriangular.h | |
| parent | 70195a5ff7b9b6460cea2ba3daf4cc71de322b91 (diff) | |
Do not copy for trivial 1x1 case. This also avoids a "maybe-uninitialized" warning in some situations.
Diffstat (limited to 'Eigen/src/Core/SolveTriangular.h')
| -rw-r--r-- | Eigen/src/Core/SolveTriangular.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/SolveTriangular.h b/Eigen/src/Core/SolveTriangular.h index a33356423..96d3dde50 100644 --- a/Eigen/src/Core/SolveTriangular.h +++ b/Eigen/src/Core/SolveTriangular.h @@ -169,7 +169,7 @@ void TriangularViewImpl<MatrixType,Mode,Dense>::solveInPlace(const MatrixBase<Ot eigen_assert( derived().cols() == derived().rows() && ((Side==OnTheLeft && derived().cols() == other.rows()) || (Side==OnTheRight && derived().cols() == other.cols())) ); eigen_assert((!(Mode & ZeroDiag)) && bool(Mode & (Upper|Lower))); - enum { copy = internal::traits<OtherDerived>::Flags & RowMajorBit && OtherDerived::IsVectorAtCompileTime }; + enum { copy = (internal::traits<OtherDerived>::Flags & RowMajorBit) && OtherDerived::IsVectorAtCompileTime && OtherDerived::SizeAtCompileTime!=1}; typedef typename internal::conditional<copy, typename internal::plain_matrix_type_column_major<OtherDerived>::type, OtherDerived&>::type OtherCopy; OtherCopy otherCopy(other); |