From d1e9f39a9aac85eeec2e17f00aef24cb35537be3 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Tue, 22 Jul 2014 18:28:19 +0200
Subject: [PATCH] Ambiguous call fixes  for clang.

---
 Eigen/src/Core/PlainObjectBase.h | 11 ++++++++---
 test/basicstuff.cpp              | 10 ++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Eigen/src/Core/PlainObjectBase.h b/Eigen/src/Core/PlainObjectBase.h
index 82d96eb92..f8292c793 100644
--- a/Eigen/src/Core/PlainObjectBase.h
+++ b/Eigen/src/Core/PlainObjectBase.h
@@ -693,7 +693,11 @@ class PlainObjectBase : public internal::dense_xpr_base<Derived>::type
     
     template<typename T0, typename T1>
     EIGEN_DEVICE_FUNC 
-    EIGEN_STRONG_INLINE void _init2(const Index& val0, const Index& val1, typename internal::enable_if<(!internal::is_same<Index,Scalar>::value) && Base::SizeAtCompileTime==2,T1>::type* = 0)
+    EIGEN_STRONG_INLINE void _init2(const Index& val0, const Index& val1,
+                                    typename internal::enable_if<    (!internal::is_same<Index,Scalar>::value)
+                                                                  && (internal::is_same<T0,Index>::value)
+                                                                  && (internal::is_same<T1,Index>::value)
+                                                                  && Base::SizeAtCompileTime==2,T1>::type* = 0)
     {
       EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE(PlainObjectBase, 2)
       m_storage.data()[0] = Scalar(val0);
@@ -719,8 +723,9 @@ class PlainObjectBase : public internal::dense_xpr_base<Derived>::type
     template<typename T>
     EIGEN_DEVICE_FUNC
     EIGEN_STRONG_INLINE void _init1(const Index& val0,
-                                    typename internal::enable_if<     (!internal::is_same<Index,Scalar>::value)
-                                                                  &&  Base::SizeAtCompileTime==1
+                                    typename internal::enable_if<    (!internal::is_same<Index,Scalar>::value)
+                                                                  && (internal::is_same<Index,T>::value)
+                                                                  && Base::SizeAtCompileTime==1
                                                                   && internal::is_convertible<T, Scalar>::value,T*>::type* = 0)
     {
       EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE(PlainObjectBase, 1)
diff --git a/test/basicstuff.cpp b/test/basicstuff.cpp
index 70cefe19f..3d7d74d4e 100644
--- a/test/basicstuff.cpp
+++ b/test/basicstuff.cpp
@@ -211,7 +211,10 @@ void fixedSizeMatrixConstruction()
     for(int k=0; k<2; ++k) VERIFY(a2(k) == DenseIndex(raw[k]));
   }
   {
-    Matrix<Scalar,1,2> m(raw), m2( (DenseIndex(raw[0])), (DenseIndex(raw[1])) );
+    Matrix<Scalar,1,2> m(raw),
+                       m2( (DenseIndex(raw[0])), (DenseIndex(raw[1])) ),
+                       m3( (int(raw[0])), (int(raw[1])) ),
+                       m4( (float(raw[0])), (float(raw[1])) );
     Array<Scalar,1,2> a(raw),  a2( (DenseIndex(raw[0])), (DenseIndex(raw[1])) );
     for(int k=0; k<2; ++k) VERIFY(m(k) == raw[k]);
     for(int k=0; k<2; ++k) VERIFY(a(k) == raw[k]);
@@ -219,9 +222,11 @@ void fixedSizeMatrixConstruction()
     VERIFY((a==Array<Scalar,1,2>(raw[0],raw[1])).all());
     for(int k=0; k<2; ++k) VERIFY(m2(k) == DenseIndex(raw[k]));
     for(int k=0; k<2; ++k) VERIFY(a2(k) == DenseIndex(raw[k]));
+    for(int k=0; k<2; ++k) VERIFY(m3(k) == int(raw[k]));
+    for(int k=0; k<2; ++k) VERIFY(m4(k) == float(raw[k]));
   }
   {
-    Matrix<Scalar,1,1> m(raw), m1(raw[0]), m2( (DenseIndex(raw[0])) );
+    Matrix<Scalar,1,1> m(raw), m1(raw[0]), m2( (DenseIndex(raw[0])) ), m3( (int(raw[0])) );
     Array<Scalar,1,1> a(raw), a1(raw[0]), a2( (DenseIndex(raw[0])) );
     VERIFY(m(0) == raw[0]);
     VERIFY(a(0) == raw[0]);
@@ -229,6 +234,7 @@ void fixedSizeMatrixConstruction()
     VERIFY(a1(0) == raw[0]);
     VERIFY(m2(0) == DenseIndex(raw[0]));
     VERIFY(a2(0) == DenseIndex(raw[0]));
+    VERIFY(m3(0) == int(raw[0]));
     VERIFY_IS_EQUAL(m,(Matrix<Scalar,1,1>(raw[0])));
     VERIFY((a==Array<Scalar,1,1>(raw[0])).all());
   }