diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-10-06 17:14:56 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-10-06 17:14:56 +0200 |
| commit | fb51bab27295faa1b9ec98bbdcee667f22465c92 (patch) | |
| tree | 703683e64ae2c3376e40ea5b4f057b472f3867db /Eigen/src/Core/AssignEvaluator.h | |
| parent | 2c676ddb40ebe380312795770fcf9fee63f63b2c (diff) | |
Some cleaning
Diffstat (limited to 'Eigen/src/Core/AssignEvaluator.h')
| -rw-r--r-- | Eigen/src/Core/AssignEvaluator.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Eigen/src/Core/AssignEvaluator.h b/Eigen/src/Core/AssignEvaluator.h index c4ba60d6d..f94539094 100644 --- a/Eigen/src/Core/AssignEvaluator.h +++ b/Eigen/src/Core/AssignEvaluator.h @@ -565,9 +565,6 @@ public: EIGEN_DEVICE_FUNC Index cols() const { return m_dstExpr.cols(); } EIGEN_DEVICE_FUNC Index outerStride() const { return m_dstExpr.outerStride(); } - // TODO get rid of this one: - EIGEN_DEVICE_FUNC DstXprType& dstExpression() const { return m_dstExpr; } - EIGEN_DEVICE_FUNC DstEvaluatorType& dstEvaluator() { return m_dst; } EIGEN_DEVICE_FUNC const SrcEvaluatorType& srcEvaluator() const { return m_src; } @@ -737,11 +734,9 @@ template<typename Dst, typename Src, typename Func> EIGEN_DEVICE_FUNC void call_assignment_no_alias(Dst& dst, const Src& src, const Func& func) { enum { - NeedToTranspose = ( (int(Dst::RowsAtCompileTime) == 1 && int(Src::ColsAtCompileTime) == 1) - | // FIXME | instead of || to please GCC 4.4.0 stupid warning "suggest parentheses around &&". - // revert to || as soon as not needed anymore. - (int(Dst::ColsAtCompileTime) == 1 && int(Src::RowsAtCompileTime) == 1)) - && int(Dst::SizeAtCompileTime) != 1 + NeedToTranspose = ( (int(Dst::RowsAtCompileTime) == 1 && int(Src::ColsAtCompileTime) == 1) + || (int(Dst::ColsAtCompileTime) == 1 && int(Src::RowsAtCompileTime) == 1) + ) && int(Dst::SizeAtCompileTime) != 1 }; Index dstRows = NeedToTranspose ? src.cols() : src.rows(); |