From f36538049669a7efee57f2b1e3c60bf8bf3976bb Mon Sep 17 00:00:00 2001
From: Christoph Hertzberg <chtz@informatik.uni-bremen.de>
Date: Fri, 4 Jul 2014 12:52:55 +0200
Subject: Fix regression introduced by 3117036b80075390dbc46f60aa0d595e5a44661b
 : Matrix<Scalar,1,1>(int) did not compile if Scalar is not constructible from
 int. Now this falls back to the (Index size) constructor.

---
 Eigen/src/Core/util/Meta.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'Eigen/src/Core/util/Meta.h')

diff --git a/Eigen/src/Core/util/Meta.h b/Eigen/src/Core/util/Meta.h
index e4e4d4a87..795197f59 100644
--- a/Eigen/src/Core/util/Meta.h
+++ b/Eigen/src/Core/util/Meta.h
@@ -80,6 +80,25 @@ template<typename T> struct add_const_on_value_type<T*>        { typedef T const
 template<typename T> struct add_const_on_value_type<T* const>  { typedef T const* const type; };
 template<typename T> struct add_const_on_value_type<T const* const>  { typedef T const* const type; };
 
+
+template<typename From, typename To>
+struct is_convertible
+{
+private:
+  struct yes {int a[1];};
+  struct no  {int a[2];};
+  
+  template<typename T>
+  static yes test (const T&) {}
+  
+  template<typename> static no test (...) {}
+
+public:
+  static From ms_from;
+  enum { value = sizeof(test<To>(ms_from))==sizeof(yes) };
+};
+
+
 /** \internal Allows to enable/disable an overload
   * according to a compile time condition.
   */
-- 
cgit v1.2.3