From b44240180fdefc07fb576cc107c99aa60989eba9 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Thu, 4 Feb 2010 17:17:57 +0100
Subject: [PATCH] optiization: make hybrid small/large outer products use the
 unrolled path

---
 Eigen/src/Core/Product.h     | 2 ++
 Eigen/src/Core/ProductBase.h | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Eigen/src/Core/Product.h b/Eigen/src/Core/Product.h
index c6bd21961..7cfdee6cf 100644
--- a/Eigen/src/Core/Product.h
+++ b/Eigen/src/Core/Product.h
@@ -93,6 +93,8 @@ template<>                    struct ei_product_type_selector<Small,1,    Small>
 template<>                    struct ei_product_type_selector<1,    Small,Small>  { enum { ret = UnrolledProduct }; };
 template<>                    struct ei_product_type_selector<Small,Small,Small>  { enum { ret = UnrolledProduct }; };
 template<>                    struct ei_product_type_selector<Small, Small, 1>    { enum { ret = UnrolledProduct }; };
+template<>                    struct ei_product_type_selector<Small, Large, 1>    { enum { ret = UnrolledProduct }; };
+template<>                    struct ei_product_type_selector<Large, Small, 1>    { enum { ret = UnrolledProduct }; };
 template<>                    struct ei_product_type_selector<1,    Large,Small>  { enum { ret = GemvProduct }; };
 template<>                    struct ei_product_type_selector<1,    Large,Large>  { enum { ret = GemvProduct }; };
 template<>                    struct ei_product_type_selector<1,    Small,Large>  { enum { ret = GemvProduct }; };
diff --git a/Eigen/src/Core/ProductBase.h b/Eigen/src/Core/ProductBase.h
index 44dd587d9..4e5490d6a 100644
--- a/Eigen/src/Core/ProductBase.h
+++ b/Eigen/src/Core/ProductBase.h
@@ -47,13 +47,6 @@ struct ei_traits<ProductBase<Derived,_Lhs,_Rhs> > //: ei_traits<typename ei_clea
   };
 };
 
-// enforce evaluation before nesting
-template<typename Derived, typename Lhs, typename Rhs,int N,typename EvalType>
-struct ei_nested<ProductBase<Derived,Lhs,Rhs>, N, EvalType>
-{
-  typedef EvalType type;
-};
-
 #define EIGEN_PRODUCT_PUBLIC_INTERFACE(Derived) \
   typedef ProductBase<Derived, Lhs, Rhs > Base; \
   EIGEN_DENSE_PUBLIC_INTERFACE(Derived) \