Ticket #4441: enable_if_sfinae.patch

matrix_expression.hpp

@@ -2940 +2940 @@
     // (t * m) [i] [j] = t * m [i] [j]
     template<class T1, class E2>
     BOOST_UBLAS_INLINE
-    typename enable_if< is_convertible<T1, typename E2::value_type >,
-    typename matrix_binary_scalar1_traits<const T1, E2, scalar_multiplies<T1, typename E2::value_type> >::result_type
-    >::type
+    typename matrix_binary_scalar1_traits<const typename boost::enable_if_c<boost::is_arithmetic<T1>::value, T1>::type, E2, scalar_multiplies<T1, typename E2::value_type> >::result_type
     operator * (const T1 &e1,
                 const matrix_expression<E2> &e2) {
         typedef typename matrix_binary_scalar1_traits<const T1, E2, scalar_multiplies<T1, typename E2::value_type> >::expression_type expression_type;
@@ -3375 +3373 @@
     // (m * t) [i] [j] = m [i] [j] * t
     template<class E1, class T2>
     BOOST_UBLAS_INLINE
-    typename enable_if< is_convertible<T2, typename E1::value_type>,
-    typename matrix_binary_scalar2_traits<E1, const T2, scalar_multiplies<typename E1::value_type, T2> >::result_type
-    >::type
+    typename matrix_binary_scalar2_traits<E1, const typename boost::enable_if_c<boost::is_arithmetic<T2>::value, T2>::type, scalar_multiplies<typename E1::value_type, T2> >::result_type
     operator * (const matrix_expression<E1> &e1,
                 const T2 &e2) {
         typedef typename matrix_binary_scalar2_traits<E1, const T2, scalar_multiplies<typename E1::value_type, T2> >::expression_type expression_type;

vector_expression.hpp

@@ -15 +15 @@
 
 #include <boost/numeric/ublas/expression_types.hpp>
 
-
 // Expression templates based on ideas of Todd Veldhuizen and Geoffrey Furnish
 // Iterators based on ideas of Jeremy Siek
 //
@@ -1170 +1169 @@
     // (t * v) [i] = t * v [i]
     template<class T1, class E2>
     BOOST_UBLAS_INLINE
-    typename enable_if< is_convertible<T1, typename E2::value_type >,    
-    typename vector_binary_scalar1_traits<const T1, E2, scalar_multiplies<T1, typename E2::value_type> >::result_type
-    >::type
+    typename vector_binary_scalar1_traits<      const typename boost::enable_if_c<boost::is_arithmetic<T1>::value, T1>::type,
+                                                                                        E2,
+                                                                                        scalar_multiplies<T1, typename E2::value_type> >::result_type
     operator * (const T1 &e1,
                 const vector_expression<E2> &e2) {
         typedef typename vector_binary_scalar1_traits<const T1, E2, scalar_multiplies<T1, typename E2::value_type> >::expression_type expression_type;
@@ -1397 +1396 @@
     // (v * t) [i] = v [i] * t
     template<class E1, class T2>
     BOOST_UBLAS_INLINE
-    typename enable_if< is_convertible<T2, typename E1::value_type >,    
-    typename vector_binary_scalar2_traits<E1, const T2, scalar_multiplies<typename E1::value_type, T2> >::result_type
-    >::type
+    typename vector_binary_scalar2_traits<E1, const typename boost::enable_if_c<boost::is_arithmetic<T2>::value, T2>::type, scalar_multiplies<typename E1::value_type, T2> >::result_type
     operator * (const vector_expression<E1> &e1,
                 const T2 &e2) {
         typedef typename vector_binary_scalar2_traits<E1, const T2, scalar_multiplies<typename E1::value_type, T2> >::expression_type expression_type;