[Boost-commit] svn:boost r80080 - trunk/boost/type_traits

Subject: [Boost-commit] svn:boost r80080 - trunk/boost/type_traits
From: mimomorin_at_[hidden]
Date: 2012-08-18 22:03:07

Author: michel
Date: 2012-08-18 22:03:07 EDT (Sat, 18 Aug 2012)
New Revision: 80080
URL: http://svn.boost.org/trac/boost/changeset/80080

Log:
Fixing `is_convertible` for function types; fixes #7246
Text files modified: 
   trunk/boost/type_traits/is_convertible.hpp |     8 +++++++-                                
   1 files changed, 7 insertions(+), 1 deletions(-)

Modified: trunk/boost/type_traits/is_convertible.hpp
==============================================================================
--- trunk/boost/type_traits/is_convertible.hpp	(original)
+++ trunk/boost/type_traits/is_convertible.hpp	2012-08-18 22:03:07 EDT (Sat, 18 Aug 2012)
@@ -25,9 +25,9 @@
 #include <boost/type_traits/is_abstract.hpp>
 #endif
 #include <boost/type_traits/add_rvalue_reference.hpp>
+#include <boost/type_traits/is_function.hpp>
 
 #if defined(__MWERKS__)
-#include <boost/type_traits/is_function.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #endif
 
@@ -299,6 +299,9 @@
             >::value,
             ::boost::type_traits::ice_not<
                ::boost::is_array<To>::value
+            >::value,
+            ::boost::type_traits::ice_not<
+               ::boost::is_function<To>::value
             >::value
         >::value) };
 };
@@ -315,6 +318,9 @@
             >::value,
             ::boost::type_traits::ice_not<
                ::boost::is_array<To>::value
+            >::value,
+            ::boost::type_traits::ice_not<
+               ::boost::is_function<To>::value
             >::value
         >::value)
         );