From 6f846ef9c6ef3e838d1361a30dc11f65ddff967d Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Tue, 1 Jul 2014 17:51:53 +0200
Subject: Split StorageKind promotion into two helpers: one for products, and
 one for coefficient-wise operations.

---
 Eigen/src/Core/CwiseBinaryOp.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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

diff --git a/Eigen/src/Core/CwiseBinaryOp.h b/Eigen/src/Core/CwiseBinaryOp.h
index 355f3bdc8..b4662907e 100644
--- a/Eigen/src/Core/CwiseBinaryOp.h
+++ b/Eigen/src/Core/CwiseBinaryOp.h
@@ -56,8 +56,9 @@ struct traits<CwiseBinaryOp<BinaryOp, Lhs, Rhs> >
                        typename Rhs::Scalar
                      )
                    >::type Scalar;
-  typedef typename promote_storage_type<typename traits<Lhs>::StorageKind,
-                                           typename traits<Rhs>::StorageKind>::ret StorageKind;
+  typedef typename cwise_promote_storage_type<typename traits<Lhs>::StorageKind,
+                                              typename traits<Rhs>::StorageKind,
+                                              BinaryOp>::ret StorageKind;
   typedef typename promote_index_type<typename traits<Lhs>::Index,
                                          typename traits<Rhs>::Index>::type Index;
   typedef typename Lhs::Nested LhsNested;
@@ -98,8 +99,9 @@ template<typename BinaryOp, typename LhsType, typename RhsType>
 class CwiseBinaryOp : internal::no_assignment_operator,
   public CwiseBinaryOpImpl<
           BinaryOp, LhsType, RhsType,
-          typename internal::promote_storage_type<typename internal::traits<LhsType>::StorageKind,
-                                           typename internal::traits<RhsType>::StorageKind>::ret>
+          typename internal::cwise_promote_storage_type<typename internal::traits<LhsType>::StorageKind,
+                                                        typename internal::traits<RhsType>::StorageKind,
+                                                        BinaryOp>::ret>
 {
   public:
     
@@ -108,8 +110,9 @@ class CwiseBinaryOp : internal::no_assignment_operator,
 
     typedef typename CwiseBinaryOpImpl<
         BinaryOp, LhsType, RhsType,
-        typename internal::promote_storage_type<typename internal::traits<LhsType>::StorageKind,
-                                         typename internal::traits<Rhs>::StorageKind>::ret>::Base Base;
+        typename internal::cwise_promote_storage_type<typename internal::traits<LhsType>::StorageKind,
+                                                      typename internal::traits<Rhs>::StorageKind,
+                                                      BinaryOp>::ret>::Base Base;
     EIGEN_GENERIC_PUBLIC_INTERFACE(CwiseBinaryOp)
 
     typedef typename internal::nested<LhsType>::type LhsNested;
-- 
cgit v1.2.3