From 2828c995c55891b0769b6a4cf3a9e99fe53b01d3 Mon Sep 17 00:00:00 2001
From: Chen-Pang He <jdh8@ms63.hinet.net>
Date: Sun, 9 Sep 2012 21:35:28 +0800
Subject: Use conj_expr_if to clarify what it's doing.

---
 blas/GeneralRank1Update.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'blas/GeneralRank1Update.h')

diff --git a/blas/GeneralRank1Update.h b/blas/GeneralRank1Update.h
index 6d33fbcc1..07d388c88 100644
--- a/blas/GeneralRank1Update.h
+++ b/blas/GeneralRank1Update.h
@@ -21,9 +21,10 @@ struct general_rank1_update<Scalar,Index,ColMajor,ConjLhs,ConjRhs>
 {
   static void run(Index rows, Index cols, Scalar* mat, Index stride, const Scalar* u, const Scalar* v, Scalar alpha)
   {
-    internal::conj_if<ConjRhs> cj;
     typedef Map<const Matrix<Scalar,Dynamic,1> > OtherMap;
-    typedef typename internal::conditional<ConjLhs,typename OtherMap::ConjugateReturnType,const OtherMap&>::type ConjRhsType;
+    typedef typename conj_expr_if<ConjLhs,OtherMap>::type ConjRhsType;
+    conj_if<ConjRhs> cj;
+
     for (Index i=0; i<cols; ++i)
       Map<Matrix<Scalar,Dynamic,1> >(mat+stride*i,rows) += alpha * cj(v[i]) * ConjRhsType(OtherMap(u,rows));
   }
-- 
cgit v1.2.3