Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r73108 - sandbox/conversion/boost/conversion/type_traits
From: vicente.botet_at_[hidden]
Date: 2011-07-14 14:10:07


Author: viboes
Date: 2011-07-14 14:10:06 EDT (Thu, 14 Jul 2011)
New Revision: 73108
URL: http://svn.boost.org/trac/boost/changeset/73108

Log:
conversion: fix is_assignable with clang
Text files modified:
   sandbox/conversion/boost/conversion/type_traits/is_constructible.hpp | 9 ++++++---
   1 files changed, 6 insertions(+), 3 deletions(-)

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-07-14 14:10:06 EDT (Thu, 14 Jul 2011)
@@ -35,8 +35,8 @@
 
   //! Macro stating if the compiler doesn't support the features needed to define the @c is_constructible type trait.
   #define BOOST_CONVERSION_NO_IS_CONSTRUCTIBLE
- // Macro stating if the compiler doesn't support the features needed to define the @c is_default_constructible type trait.
- //#define BOOST_CONVERSION_NO_IS_DEFAULT_CONSTRUCTIBLE
+ //! Macro stating if the compiler doesn't support the features needed to define the @c is_default_constructible type trait.
+ #define BOOST_CONVERSION_NO_IS_DEFAULT_CONSTRUCTIBLE
   //! Max number of arguments to is_constructible when using variadic templates emulation.
   #define BOOST_CONVERSION_TT_IS_CONSTRUCTIBLE_ARITY_MAX
 
@@ -102,12 +102,15 @@
     #undef M0
     #undef M1
 
- #if defined __GNUC__
+ #if defined __clang__
+ #elif defined __GNUC__
        #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 7 )
          #define BOOST_CONVERSION_NO_IS_DEFAULT_CONSTRUCTIBLE
        #endif
     #else
+ #endif
 
+ #if ! defined BOOST_CONVERSION_NO_IS_DEFAULT_CONSTRUCTIBLE
     #define M1(z,n,t) void
 
     template<class T> \


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk