From 73084dc754a64a5ae5753ef119399ea7e45c0626 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Wed, 28 May 2008 09:09:18 +0000
Subject: * 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

---
 Eigen/src/Core/CwiseUnaryOp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Eigen/src/Core/CwiseUnaryOp.h')

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
-- 
cgit v1.2.3