From 9661180a4d0141c3fb3eb74f8e27308fe020559f Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Mon, 29 Aug 2016 10:31:10 +0200
Subject: [PATCH] Fix previous backport.

---
 Eigen/src/Core/util/BlasUtil.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Eigen/src/Core/util/BlasUtil.h b/Eigen/src/Core/util/BlasUtil.h
index ec7ad6b1e..e74381432 100644
--- a/Eigen/src/Core/util/BlasUtil.h
+++ b/Eigen/src/Core/util/BlasUtil.h
@@ -58,7 +58,7 @@ template<> struct conj_if<false> {
 template<typename LhsScalar, typename RhsScalar, bool ConjLhs, bool ConjRhs>
 struct conj_helper
 {
-  typedef typename ScalarBinaryOpTraits<LhsScalar,RhsScalar>::ReturnType Scalar;
+  typedef typename scalar_product_traits<LhsScalar,RhsScalar>::ReturnType Scalar;
 
   EIGEN_STRONG_INLINE Scalar pmadd(const LhsScalar& x, const RhsScalar& y, const Scalar& c) const
   { return padd(c, pmul(x,y)); }