diff --git a/include/boost/type_traits/is_base_and_derived.hpp b/include/boost/type_traits/is_base_and_derived.hpp
index af9e2fb..b699ae8 100644
--- a/include/boost/type_traits/is_base_and_derived.hpp
+++ b/include/boost/type_traits/is_base_and_derived.hpp
@@ -25,6 +25,7 @@ namespace boost {
 namespace detail {
 
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)) \
+ && !BOOST_WORKAROUND(__SUNPRO_CC , BOOST_TESTED_AT(0x540)) \
  && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
                              // The EDG version number is a lower estimate.
                              // It is not currently known which EDG version
diff --git a/include/boost/type_traits/is_class.hpp b/include/boost/type_traits/is_class.hpp
index 15d8df9..e952b9c 100644
--- a/include/boost/type_traits/is_class.hpp
+++ b/include/boost/type_traits/is_class.hpp
@@ -82,6 +82,7 @@ struct is_class_impl
         ::boost::type_traits::ice_not< ::boost::is_array<T>::value >::value,
         ::boost::type_traits::ice_not< ::boost::is_reference<T>::value>::value,
         ::boost::type_traits::ice_not< ::boost::is_void<T>::value >::value
+        ::boost::type_traits::ice_not< ::boost::is_function<T>::value >::value
         >::value));
 #   endif
 };