diff options
author | Gael Guennebaud <g.gael@free.fr> | 2015-12-30 16:47:49 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2015-12-30 16:47:49 +0100 |
commit | 9900782e882b9429e44ad4902476cbaa489edbfa (patch) | |
tree | b0a99af7f80ba27327945607a7dbcc77ee17ed5a | |
parent | 70404e07c246b986bac4661428dda92b182725a2 (diff) |
Mark AlignedBit and EvalBeforeNestingBit with deprecated attribute, and remove the remaining usages of EvalBeforeNestingBit.
-rw-r--r-- | Eigen/src/Core/TriangularMatrix.h | 9 | ||||
-rw-r--r-- | Eigen/src/Core/util/Constants.h | 6 |
2 files changed, 4 insertions, 11 deletions
diff --git a/Eigen/src/Core/TriangularMatrix.h b/Eigen/src/Core/TriangularMatrix.h index 099a02ec3..7d6a97848 100644 --- a/Eigen/src/Core/TriangularMatrix.h +++ b/Eigen/src/Core/TriangularMatrix.h @@ -595,14 +595,7 @@ template<typename Derived> template<typename DenseDerived> void TriangularBase<Derived>::evalTo(MatrixBase<DenseDerived> &other) const { - if(internal::traits<Derived>::Flags & EvalBeforeAssigningBit) - { - typename internal::plain_matrix_type<Derived>::type other_evaluated(rows(), cols()); - evalToLazy(other_evaluated); - other.derived().swap(other_evaluated); - } - else - evalToLazy(other.derived()); + evalToLazy(other.derived()); } /*************************************************************************** diff --git a/Eigen/src/Core/util/Constants.h b/Eigen/src/Core/util/Constants.h index 960bb434d..9e6816021 100644 --- a/Eigen/src/Core/util/Constants.h +++ b/Eigen/src/Core/util/Constants.h @@ -67,6 +67,7 @@ const unsigned int EvalBeforeNestingBit = 0x2; /** \ingroup flags * \deprecated * means the expression should be evaluated before any assignment */ +EIGEN_DEPRECATED const unsigned int EvalBeforeAssigningBit = 0x4; // FIXME deprecated /** \ingroup flags @@ -158,7 +159,7 @@ const unsigned int DirectAccessBit = 0x40; * expression.packet<Aligned>(0); * \endcode */ -const unsigned int AlignedBit = 0x80; +EIGEN_DEPRECATED const unsigned int AlignedBit = 0x80; const unsigned int NestByRefBit = 0x100; @@ -187,8 +188,7 @@ const unsigned int CompressedAccessBit = 0x400; // list of flags that are inherited by default const unsigned int HereditaryBits = RowMajorBit - | EvalBeforeNestingBit - | EvalBeforeAssigningBit; + | EvalBeforeNestingBit; /** \defgroup enums Enumerations * \ingroup Core_Module |