diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2008-10-27 13:26:18 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2008-10-27 13:26:18 +0000 |
| commit | b26e04f40b113f54e1d5b405d7cd88e21a37c919 (patch) | |
| tree | fd31fdc97760e9899809935dc5f06d05cf40b859 /Eigen | |
| parent | 9f873a855f321766ead35367284f4594809f9df9 (diff) | |
add Eigen namespace in EIGEN_INHERIT_ASSIGNMENT_OPERATOR
Diffstat (limited to 'Eigen')
| -rwxr-xr-x | Eigen/src/Core/SolveTriangular.h | 4 | ||||
| -rw-r--r-- | Eigen/src/Core/util/Macros.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/SolveTriangular.h b/Eigen/src/Core/SolveTriangular.h index dfcbfe18e..20c0408bd 100755 --- a/Eigen/src/Core/SolveTriangular.h +++ b/Eigen/src/Core/SolveTriangular.h @@ -233,8 +233,8 @@ void MatrixBase<Derived>::solveTriangularInPlace(MatrixBase<OtherDerived>& other ei_assert(!(Flags & ZeroDiagBit)); ei_assert(Flags & (UpperTriangularBit|LowerTriangularBit)); - enum { copy = ei_traits<OtherDerived>::Flags&RowMajorBit }; - + enum { copy = ei_traits<OtherDerived>::Flags & RowMajorBit }; + typedef typename ei_meta_if<copy, typename ei_eval_to_column_major<OtherDerived>::type, OtherDerived&>::ret OtherCopy; OtherCopy otherCopy(other.derived()); diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index 348f313d2..b95f72e7b 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -113,7 +113,7 @@ using Eigen::ei_cos; #define EIGEN_INHERIT_ASSIGNMENT_OPERATOR(Derived, Op) \ template<typename OtherDerived> \ -Derived& operator Op(const MatrixBase<OtherDerived>& other) \ +Derived& operator Op(const Eigen::MatrixBase<OtherDerived>& other) \ { \ return Eigen::MatrixBase<Derived>::operator Op(other.derived()); \ } \ |