diff options
author | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-04-16 10:13:32 -0400 |
---|---|---|
committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-04-16 10:13:32 -0400 |
commit | ff6a46105d86e92753858c1b2aea8bcaf4575819 (patch) | |
tree | db7644512aa5adaaba50dc3c7f420508951116e5 /Eigen/src/Core/CwiseBinaryOp.h | |
parent | 1803db6e8409dae534cca51433a6a0fd6e7c7665 (diff) |
* Refactoring of the class hierarchy: introduction of DenseDirectAccessBase, removal of extra _Base/_Options template parameters.
* Introduction of strides-at-compile-time so for example the optimized code really knows when it needs to evaluate to a temporary
* StorageKind / XprKind
* Quaternion::setFromTwoVectors: use JacobiSVD instead of SVD
* ComplexSchur: support the 1x1 case
Diffstat (limited to 'Eigen/src/Core/CwiseBinaryOp.h')
-rw-r--r-- | Eigen/src/Core/CwiseBinaryOp.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Eigen/src/Core/CwiseBinaryOp.h b/Eigen/src/Core/CwiseBinaryOp.h index fb885f638..dd74f5b5c 100644 --- a/Eigen/src/Core/CwiseBinaryOp.h +++ b/Eigen/src/Core/CwiseBinaryOp.h @@ -54,8 +54,8 @@ struct ei_traits<CwiseBinaryOp<BinaryOp, Lhs, Rhs> > : ei_traits<Lhs> typename Rhs::Scalar ) >::type Scalar; - typedef typename ei_promote_storage_type<typename ei_traits<Lhs>::StorageType, - typename ei_traits<Rhs>::StorageType>::ret StorageType; + typedef typename ei_promote_storage_type<typename ei_traits<Lhs>::StorageKind, + typename ei_traits<Rhs>::StorageKind>::ret StorageKind; typedef typename Lhs::Nested LhsNested; typedef typename Rhs::Nested RhsNested; typedef typename ei_unref<LhsNested>::type _LhsNested; @@ -80,22 +80,22 @@ struct ei_traits<CwiseBinaryOp<BinaryOp, Lhs, Rhs> > : ei_traits<Lhs> }; }; -template<typename BinaryOp, typename Lhs, typename Rhs, typename StorageType> +template<typename BinaryOp, typename Lhs, typename Rhs, typename StorageKind> class CwiseBinaryOpImpl; template<typename BinaryOp, typename Lhs, typename Rhs> class CwiseBinaryOp : ei_no_assignment_operator, public CwiseBinaryOpImpl< BinaryOp, Lhs, Rhs, - typename ei_promote_storage_type<typename ei_traits<Lhs>::StorageType, - typename ei_traits<Rhs>::StorageType>::ret> + typename ei_promote_storage_type<typename ei_traits<Lhs>::StorageKind, + typename ei_traits<Rhs>::StorageKind>::ret> { public: typedef typename CwiseBinaryOpImpl< BinaryOp, Lhs, Rhs, - typename ei_promote_storage_type<typename ei_traits<Lhs>::StorageType, - typename ei_traits<Rhs>::StorageType>::ret>::Base Base; + typename ei_promote_storage_type<typename ei_traits<Lhs>::StorageKind, + typename ei_traits<Rhs>::StorageKind>::ret>::Base Base; EIGEN_GENERIC_PUBLIC_INTERFACE_NEW(CwiseBinaryOp) typedef typename ei_nested<Lhs>::type LhsNested; |