GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-12 11:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mark AlignedBit and EvalBeforeNestingBit with deprecated attribute, and remove the remaining usages of EvalBeforeNestingBit.

Browse Source
This commit is contained in:
Gael Guennebaud 2015-12-30 16:47:49 +01:00
parent 70404e07c2
commit 9900782e88
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Eigen/src/Core/TriangularMatrix.h
View File

@ -595,14 +595,7 @@ template<typename Derived>
template<typename DenseDerived> template<typename DenseDerived>
void TriangularBase<Derived>::evalTo(MatrixBase<DenseDerived> &other) const void TriangularBase<Derived>::evalTo(MatrixBase<DenseDerived> &other) const
{ {
if(internal::traits<Derived>::Flags & EvalBeforeAssigningBit) evalToLazy(other.derived());
{
typename internal::plain_matrix_type<Derived>::type other_evaluated(rows(), cols());
evalToLazy(other_evaluated);
other.derived().swap(other_evaluated);
}
else
evalToLazy(other.derived());
} }
/*************************************************************************** /***************************************************************************

6
Eigen/src/Core/util/Constants.h
View File

@ -67,6 +67,7 @@ const unsigned int EvalBeforeNestingBit = 0x2;
/** \ingroup flags /** \ingroup flags
* \deprecated * \deprecated
* means the expression should be evaluated before any assignment */ * means the expression should be evaluated before any assignment */
EIGEN_DEPRECATED
const unsigned int EvalBeforeAssigningBit = 0x4; // FIXME deprecated const unsigned int EvalBeforeAssigningBit = 0x4; // FIXME deprecated
/** \ingroup flags /** \ingroup flags
@ -158,7 +159,7 @@ const unsigned int DirectAccessBit = 0x40;
* expression.packet<Aligned>(0); * expression.packet<Aligned>(0);
* \endcode * \endcode
*/ */
const unsigned int AlignedBit = 0x80; EIGEN_DEPRECATED const unsigned int AlignedBit = 0x80;
const unsigned int NestByRefBit = 0x100; const unsigned int NestByRefBit = 0x100;
@ -187,8 +188,7 @@ const unsigned int CompressedAccessBit = 0x400;
// list of flags that are inherited by default // list of flags that are inherited by default
const unsigned int HereditaryBits = RowMajorBit const unsigned int HereditaryBits = RowMajorBit
| EvalBeforeNestingBit | EvalBeforeNestingBit;
| EvalBeforeAssigningBit;
/** \defgroup enums Enumerations /** \defgroup enums Enumerations
* \ingroup Core_Module * \ingroup Core_Module