Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r72399 - sandbox/conversion/boost/conversion
From: vicente.botet_at_[hidden]
Date: 2011-06-04 18:02:49


Author: viboes
Date: 2011-06-04 18:02:48 EDT (Sat, 04 Jun 2011)
New Revision: 72399
URL: http://svn.boost.org/trac/boost/changeset/72399

Log:
Conversion: fix bugs whith msvc which doesn't supports decltype as stated by the config file.

Text files modified:
   sandbox/conversion/boost/conversion/assign_to.hpp | 4 ++++
   sandbox/conversion/boost/conversion/convert_to.hpp | 2 ++
   2 files changed, 6 insertions(+), 0 deletions(-)

Modified: sandbox/conversion/boost/conversion/assign_to.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/assign_to.hpp (original)
+++ sandbox/conversion/boost/conversion/assign_to.hpp 2011-06-04 18:02:48 EDT (Sat, 04 Jun 2011)
@@ -34,13 +34,16 @@
 #include <cstddef> //for std::size_t
 #include <boost/conversion/convert_to.hpp>
 #include <boost/utility/enable_if.hpp>
+#if defined(BOOST_CONVERSION_ENABLE_CND)
 #include <boost/conversion/type_traits/is_copy_assignable.hpp>
 #include <boost/conversion/type_traits/is_assignable.hpp>
 #include <boost/conversion/type_traits/is_extrinsic_convertible.hpp>
+#endif
 
 namespace boost {
   namespace conversion {
 
+#if defined(BOOST_CONVERSION_ENABLE_CND)
 
     template < typename Target, typename Source>
     struct assigner_specialized
@@ -49,6 +52,7 @@
             && is_extrinsic_convertible<Source,Target>::value
>
     {};
+#endif
 
     //! Customization point for @assign_to.
     //! @tparam Target target type of the conversion.

Modified: sandbox/conversion/boost/conversion/convert_to.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/convert_to.hpp (original)
+++ sandbox/conversion/boost/conversion/convert_to.hpp 2011-06-04 18:02:48 EDT (Sat, 04 Jun 2011)
@@ -38,7 +38,9 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/integral_constant.hpp>
+#if defined(BOOST_CONVERSION_ENABLE_CND)
 #include <boost/conversion/type_traits/is_explicitly_convertible.hpp>
+#endif
 
 namespace boost {
 


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