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/Product.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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

diff --git a/Eigen/src/Core/Product.h b/Eigen/src/Core/Product.h
index e381ac46a..cb4d4c924 100644
--- a/Eigen/src/Core/Product.h
+++ b/Eigen/src/Core/Product.h
@@ -62,8 +62,9 @@ struct traits<Product<Lhs, Rhs, Option> >
   typedef MatrixXpr XprKind;
   
   typedef typename product_result_scalar<LhsCleaned,RhsCleaned>::Scalar Scalar;
-  typedef typename promote_storage_type<typename traits<LhsCleaned>::StorageKind,
-                                           typename traits<RhsCleaned>::StorageKind>::ret StorageKind;
+  typedef typename product_promote_storage_type<typename traits<LhsCleaned>::StorageKind,
+                                                typename traits<RhsCleaned>::StorageKind,
+                                                internal::product_type<Lhs,Rhs>::ret>::ret StorageKind;
   typedef typename promote_index_type<typename traits<LhsCleaned>::Index,
                                          typename traits<RhsCleaned>::Index>::type Index;
   
@@ -94,8 +95,9 @@ struct traits<Product<Lhs, Rhs, Option> >
 
 template<typename _Lhs, typename _Rhs, int Option>
 class Product : public ProductImpl<_Lhs,_Rhs,Option,
-                                   typename internal::promote_storage_type<typename internal::traits<_Lhs>::StorageKind,
-                                                                           typename internal::traits<_Rhs>::StorageKind>::ret>
+                                   typename internal::product_promote_storage_type<typename internal::traits<_Lhs>::StorageKind,
+                                                                                   typename internal::traits<_Rhs>::StorageKind,
+                                                                                   internal::product_type<_Lhs,_Rhs>::ret>::ret>
 {
   public:
     
@@ -104,8 +106,9 @@ class Product : public ProductImpl<_Lhs,_Rhs,Option,
     
     typedef typename ProductImpl<
         Lhs, Rhs, Option,
-        typename internal::promote_storage_type<typename Lhs::StorageKind,
-                                                typename Rhs::StorageKind>::ret>::Base Base;
+        typename internal::product_promote_storage_type<typename Lhs::StorageKind,
+                                                        typename Rhs::StorageKind,
+                                                        internal::product_type<Lhs,Rhs>::ret>::ret>::Base Base;
     EIGEN_GENERIC_PUBLIC_INTERFACE(Product)
 
     typedef typename internal::nested<Lhs>::type LhsNested;
-- 
cgit v1.2.3