[Boost-commit] svn:boost r47998 - branches/release/boost/type_traits

From: john_at_[hidden]
Date: 2008-08-06 05:07:55

Author: johnmaddock
Date: 2008-08-06 05:07:54 EDT (Wed, 06 Aug 2008)
New Revision: 47998
URL: http://svn.boost.org/trac/boost/changeset/47998

Log:
Merged fix for #2171 from Trunk.
Text files modified: 
   branches/release/boost/type_traits/is_abstract.hpp                |     4 ++--                                    
   branches/release/boost/type_traits/is_base_and_derived.hpp        |     4 ++--                                    
   branches/release/boost/type_traits/is_convertible.hpp             |     2 +-                                      
   branches/release/boost/type_traits/is_function.hpp                |     4 ++--                                    
   branches/release/boost/type_traits/is_member_function_pointer.hpp |     4 ++--                                    
   5 files changed, 9 insertions(+), 9 deletions(-)

Modified: branches/release/boost/type_traits/is_abstract.hpp
==============================================================================
--- branches/release/boost/type_traits/is_abstract.hpp	(original)
+++ branches/release/boost/type_traits/is_abstract.hpp	2008-08-06 05:07:54 EDT (Wed, 06 Aug 2008)
@@ -94,12 +94,12 @@
 #ifdef __GNUC__
    BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(is_abstract_imp2<T>::template check_sig<T>(0)));
 #else
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000)
 #pragma warning(push)
 #pragma warning(disable:6334)
 #endif
    BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(check_sig<T>(0)));
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000)
 #pragma warning(pop)
 #endif
 #endif

Modified: branches/release/boost/type_traits/is_base_and_derived.hpp
==============================================================================
--- branches/release/boost/type_traits/is_base_and_derived.hpp	(original)
+++ branches/release/boost/type_traits/is_base_and_derived.hpp	2008-08-06 05:07:54 EDT (Wed, 06 Aug 2008)
@@ -133,7 +133,7 @@
 template<typename B, typename D>
 struct is_base_and_derived_impl2
 {
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000)
 #pragma warning(push)
 #pragma warning(disable:6334)
 #endif
@@ -156,7 +156,7 @@
 
     BOOST_STATIC_CONSTANT(bool, value =
         sizeof(bd_helper<B,D>::check_sig(Host(), 0)) == sizeof(type_traits::yes_type));
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000)
 #pragma warning(pop)
 #endif
 };

Modified: branches/release/boost/type_traits/is_convertible.hpp
==============================================================================
--- branches/release/boost/type_traits/is_convertible.hpp	(original)
+++ branches/release/boost/type_traits/is_convertible.hpp	2008-08-06 05:07:54 EDT (Wed, 06 Aug 2008)
@@ -256,7 +256,7 @@
 #ifdef BOOST_MSVC
 #pragma warning(push)
 #pragma warning(disable:4244)
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000)
 #pragma warning(disable:6334)
 #endif
 #endif

Modified: branches/release/boost/type_traits/is_function.hpp
==============================================================================
--- branches/release/boost/type_traits/is_function.hpp	(original)
+++ branches/release/boost/type_traits/is_function.hpp	2008-08-06 05:07:54 EDT (Wed, 06 Aug 2008)
@@ -62,7 +62,7 @@
 template <typename T>
 struct is_function_impl
 {
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000)
 #pragma warning(push)
 #pragma warning(disable:6334)
 #endif
@@ -71,7 +71,7 @@
         bool, value = sizeof(::boost::type_traits::is_function_ptr_tester(t))
         == sizeof(::boost::type_traits::yes_type)
         );
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000)
 #pragma warning(pop)
 #endif
 };

Modified: branches/release/boost/type_traits/is_member_function_pointer.hpp
==============================================================================
--- branches/release/boost/type_traits/is_member_function_pointer.hpp	(original)
+++ branches/release/boost/type_traits/is_member_function_pointer.hpp	2008-08-06 05:07:54 EDT (Wed, 06 Aug 2008)
@@ -62,7 +62,7 @@
 {
     template <typename T> struct result_
     {
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000)
 #pragma warning(push)
 #pragma warning(disable:6334)
 #endif
@@ -73,7 +73,7 @@
             bool, value = (
                 1 == sizeof(::boost::type_traits::is_mem_fun_pointer_tester(self_type::make_t))
             ));
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000)
 #pragma warning(pop)
 #endif
     };