[Boost-commit] svn:boost r72689 - in sandbox/conversion/boost/conversion: . std type_traits

Subject: [Boost-commit] svn:boost r72689 - in sandbox/conversion/boost/conversion: . std type_traits
From: vicente.botet_at_[hidden]
Date: 2011-06-19 16:20:22

Author: viboes
Date: 2011-06-19 16:20:21 EDT (Sun, 19 Jun 2011)
New Revision: 72689
URL: http://svn.boost.org/trac/boost/changeset/72689

Log:
Conversion: fix some issues with gcc  4.3.4
Text files modified: 
   sandbox/conversion/boost/conversion/config.hpp                    |    24 +++++++++++++++++++++---                
   sandbox/conversion/boost/conversion/std/string.hpp                |     4 ----                                    
   sandbox/conversion/boost/conversion/type_traits/is_assignable.hpp |    12 ++++++++++++                            
   3 files changed, 33 insertions(+), 7 deletions(-)

Modified: sandbox/conversion/boost/conversion/config.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/config.hpp	(original)
+++ sandbox/conversion/boost/conversion/config.hpp	2011-06-19 16:20:21 EDT (Sun, 19 Jun 2011)
@@ -22,11 +22,29 @@
                 , typename enable_if_c< CND >::type
 
 #if defined(BOOST_CONVERSION_DOXYGEN_INVOKED)
-#define BOOST_CONVERSION_ENABLE_CND
+  #define BOOST_CONVERSION_ENABLE_CND
 #else
   #if ! defined(BOOST_NO_DECLTYPE)
-    #if ! defined _MSC_VER
-      #define BOOST_CONVERSION_ENABLE_CND
+    #if defined _MSC_VER
+       #define BOOST_CONVERSION_NO_IS_ASSIGNABLE
+    #elif defined __GNUC__
+       #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
+         #define BOOST_CONVERSION_NO_IS_ASSIGNABLE
+       #else
+         #define BOOST_CONVERSION_ENABLE_CND
+       #endif
+    #else
+     #define BOOST_CONVERSION_ENABLE_CND
+    #endif
+  #else
+    #if defined _MSC_VER
+       #define BOOST_CONVERSION_NO_IS_ASSIGNABLE
+    #elif defined __GNUC__
+       #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
+         #define BOOST_CONVERSION_NO_IS_ASSIGNABLE
+       #endif
+    #else
+       #define BOOST_CONVERSION_NO_IS_ASSIGNABLE
     #endif
   #endif
 #endif

Modified: sandbox/conversion/boost/conversion/std/string.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/std/string.hpp	(original)
+++ sandbox/conversion/boost/conversion/std/string.hpp	2011-06-19 16:20:21 EDT (Sun, 19 Jun 2011)
@@ -65,11 +65,7 @@
       std::basic_string<CharT,Traits,Alloc>&
       operator()(std::basic_string<CharT,Traits,Alloc>& to, const T& from)
       {
-          std::cout << __FILE__ << from << std::endl;
-
         to = boost::conversion::convert_to<std::basic_string<CharT,Traits,Alloc> >(from);
-                  std::cout << __FILE__ << to << std::endl;
-
         return to;
       }
     };

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-06-19 16:20:21 EDT (Sun, 19 Jun 2011)
@@ -14,6 +14,9 @@
 
 #ifndef BOOST_CONVERSION_TT_IS_ASSIGNABLE_HPP
 #define BOOST_CONVERSION_TT_IS_ASSIGNABLE_HPP
+#include <boost/conversion/config.hpp>
+
+#if !defined(BOOST_CONVERSION_NO_IS_ASSIGNABLE)
 
 #include <boost/type_traits/intrinsics.hpp>
 #if !defined(BOOST_IS_ASSIGNABLE)
@@ -136,6 +139,15 @@
 }
 
 #include <boost/type_traits/detail/bool_trait_undef.hpp>
+#else
+#include <boost/type_traits/integral_constant.hpp>
+
+namespace boost {
 
+  template < class Target, class Source>
+  struct is_assignable  : false_type
+  {};
+}
+#endif
 #endif