aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/SelfCwiseBinaryOp.h
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2010-09-06 11:51:42 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2010-09-06 11:51:42 +0200
commit9bb75937cc698b32f2fe6ffac3b4e09a89c3c5f7 (patch)
tree99d99731ff24bf0599b69d869107821cf7cee55c /Eigen/src/Core/SelfCwiseBinaryOp.h
parent62eb4dc99bb79a0e2015548c248d6270928533f1 (diff)
fix += return by value like operations
Diffstat (limited to 'Eigen/src/Core/SelfCwiseBinaryOp.h')
-rw-r--r--Eigen/src/Core/SelfCwiseBinaryOp.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/Eigen/src/Core/SelfCwiseBinaryOp.h b/Eigen/src/Core/SelfCwiseBinaryOp.h
index 5100f6b25..f77589747 100644
--- a/Eigen/src/Core/SelfCwiseBinaryOp.h
+++ b/Eigen/src/Core/SelfCwiseBinaryOp.h
@@ -62,8 +62,6 @@ template<typename BinaryOp, typename Lhs, typename Rhs> class SelfCwiseBinaryOp
typedef typename ei_packet_traits<Scalar>::type Packet;
- using Base::operator=;
-
inline SelfCwiseBinaryOp(Lhs& xpr, const BinaryOp& func = BinaryOp()) : m_matrix(xpr), m_functor(func) {}
inline Index rows() const { return m_matrix.rows(); }
@@ -142,6 +140,15 @@ template<typename BinaryOp, typename Lhs, typename Rhs> class SelfCwiseBinaryOp
#endif
return *this;
}
+
+ // overloaded to honor evaluation of special matrices
+ // maybe another solution would be to not use SelfCwiseBinaryOp
+ // at first...
+ SelfCwiseBinaryOp& operator=(const Rhs& _rhs)
+ {
+ typename ei_nested<Rhs>::type rhs(_rhs);
+ return Base::operator=(rhs);
+ }
protected:
Lhs& m_matrix;