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

Subject: [Boost-commit] svn:boost r72869 - in sandbox/conversion/boost/conversion: . std
From: vicente.botet_at_[hidden]
Date: 2011-07-03 05:46:54

Author: viboes
Date: 2011-07-03 05:46:53 EDT (Sun, 03 Jul 2011)
New Revision: 72869
URL: http://svn.boost.org/trac/boost/changeset/72869

Log:
Conversion: Force CND_ENABLE on all compilers
Text files modified: 
   sandbox/conversion/boost/conversion/config.hpp     |    16 +++++++++++-----                        
   sandbox/conversion/boost/conversion/std/string.hpp |     5 ++---                                   
   2 files changed, 13 insertions(+), 8 deletions(-)

Modified: sandbox/conversion/boost/conversion/config.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/config.hpp	(original)
+++ sandbox/conversion/boost/conversion/config.hpp	2011-07-03 05:46:53 EDT (Sun, 03 Jul 2011)
@@ -32,11 +32,10 @@
     #elif defined __GNUC__
        #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
          #define BOOST_CONVERSION_NO_IS_ASSIGNABLE
-       #else
-         #define BOOST_CONVERSION_ENABLE_CND
        #endif
+       #define BOOST_CONVERSION_ENABLE_CND
     #else
-     #define BOOST_CONVERSION_ENABLE_CND
+      #define BOOST_CONVERSION_ENABLE_CND
     #endif
   #else
     #if defined _MSC_VER
@@ -46,17 +45,24 @@
          //#define BOOST_CONVERSION_NO_IS_ASSIGNABLE
     #elif defined __GNUC__
        #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
-         #define BOOST_CONVERSION_ENABLE_CND
          #define BOOST_CONVERSION_NO_IS_ASSIGNABLE
        #endif
+       #define BOOST_CONVERSION_ENABLE_CND
     #else
        #define BOOST_CONVERSION_NO_IS_ASSIGNABLE
     #endif
   #endif
 #endif
 
+#if !defined BOOST_CONVERSION_ENABLE_CND
+#define BOOST_CONVERSION_ENABLE_CND
+#endif
+
 #if defined(BOOST_CONVERSION_ENABLE_CND) && !defined(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS)
-#define BOOST_CONVERSION_MCF_ENABLED
+  #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
+  #else
+    #define BOOST_CONVERSION_MCF_ENABLED
+  #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-07-03 05:46:53 EDT (Sun, 03 Jul 2011)
@@ -43,8 +43,8 @@
   template<typename CharT, typename Traits, typename Alloc>
   struct is_assignable< std::basic_string<CharT,Traits,Alloc>, std::basic_string<CharT,Traits,Alloc>  >  : true_type {};
 #endif
-  
-  
+
+
   namespace conversion {
 
     // std namespace can not be overloaded
@@ -84,7 +84,6 @@
     };
 
 #if !defined(BOOST_CONVERSION_ENABLE_CND)
-#error
     /**
      * Partial specialization of @c assigner_cp for convertibles to std::string.
      */