aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/CwiseUnaryOp.h
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2008-05-28 09:09:18 +0000
committerGravatar Gael Guennebaud <g.gael@free.fr>2008-05-28 09:09:18 +0000
commit73084dc754a64a5ae5753ef119399ea7e45c0626 (patch)
tree3b333df315c0b81cb8a49350278318974a97942c /Eigen/src/Core/CwiseUnaryOp.h
parentf54760c889efcfabfdb8be594abee0647ed0c8da (diff)
* added _*coeffRef members in NestedByValue
* added ConjugateReturnType and AdjointReturnType that are type-defined to Derived& and Transpose<Derived> if the scalar type is not complex: this avoids abusive copies in the cache friendly Product
Diffstat (limited to 'Eigen/src/Core/CwiseUnaryOp.h')
-rw-r--r--Eigen/src/Core/CwiseUnaryOp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/CwiseUnaryOp.h b/Eigen/src/Core/CwiseUnaryOp.h
index 8d2737e12..e2ae35b3d 100644
--- a/Eigen/src/Core/CwiseUnaryOp.h
+++ b/Eigen/src/Core/CwiseUnaryOp.h
@@ -143,10 +143,10 @@ MatrixBase<Derived>::cwiseAbs2() const
*
* \sa adjoint() */
template<typename Derived>
-inline const CwiseUnaryOp<ei_scalar_conjugate_op<typename ei_traits<Derived>::Scalar>, Derived>
+inline const typename MatrixBase<Derived>::ConjugateReturnType
MatrixBase<Derived>::conjugate() const
{
- return derived();
+ return ConjugateReturnType(derived());
}
/** \returns an expression of *this with the \a Scalar type casted to