[Boost-commit] svn:boost r73734 - sandbox/conversion/boost/conversion/type_traits

Subject: [Boost-commit] svn:boost r73734 - sandbox/conversion/boost/conversion/type_traits
From: vicente.botet_at_[hidden]
Date: 2011-08-14 08:42:54

Author: viboes
Date: 2011-08-14 08:42:53 EDT (Sun, 14 Aug 2011)
New Revision: 73734
URL: http://svn.boost.org/trac/boost/changeset/73734

Log:
conversion: fix some errors with gcc.

Text files modified: 
   sandbox/conversion/boost/conversion/type_traits/is_assignable.hpp    |     5 ++---                                   
   sandbox/conversion/boost/conversion/type_traits/is_constructible.hpp |     1 -                                       
   2 files changed, 2 insertions(+), 4 deletions(-)

Modified: sandbox/conversion/boost/conversion/type_traits/is_assignable.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/type_traits/is_assignable.hpp	(original)
+++ sandbox/conversion/boost/conversion/type_traits/is_assignable.hpp	2011-08-14 08:42:53 EDT (Sun, 14 Aug 2011)
@@ -61,7 +61,6 @@
     //#define BOOST_CONVERSION_NO_IS_ASSIGNABLE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
-#error
        #define BOOST_CONVERSION_NO_IS_ASSIGNABLE
      #else
        #define BOOST_CONVERSION_IS_ASSIGNABLE_USES_DECLTYPE
@@ -129,8 +128,8 @@
           static const bool value =
             sizeof(selector<T,S>(0)) ==
             sizeof(yes_type);
-          typedef boost::integral_constant<bool,value> type;
-          //typedef decltype(selector<T,S>(0)) type;
+          //typedef boost::integral_constant<bool,value> type;
+          typedef decltype(selector<T,S>(0)) type;
         };
 
 #elif defined BOOST_CONVERSION_IS_ASSIGNABLE_USES_SIZEOF

Modified: sandbox/conversion/boost/conversion/type_traits/is_constructible.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/type_traits/is_constructible.hpp	(original)
+++ sandbox/conversion/boost/conversion/type_traits/is_constructible.hpp	2011-08-14 08:42:53 EDT (Sun, 14 Aug 2011)
@@ -103,7 +103,6 @@
   #if defined __clang__
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 7 )
-#error
        #define BOOST_CONVERSION_NO_IS_DEFAULT_CONSTRUCTIBLE
      #endif
   #endif