[Boost-commit] svn:boost r73260 - sandbox/conversion/libs/conversion_ext/test

Subject: [Boost-commit] svn:boost r73260 - sandbox/conversion/libs/conversion_ext/test
From: vicente.botet_at_[hidden]
Date: 2011-07-20 13:17:15

Author: viboes
Date: 2011-07-20 13:17:14 EDT (Wed, 20 Jul 2011)
New Revision: 73260
URL: http://svn.boost.org/trac/boost/changeset/73260

Log:
conversion: split the ussage of BOOST_CONVERSION_DOUBLE_CP until I'm able to detect extrinsic convertible without relying on the converter bool-type
Text files modified: 
   sandbox/conversion/libs/conversion_ext/test/Jamfile.v2    |     2 ++                                      
   sandbox/conversion/libs/conversion_ext/test/extrinsec.cpp |     2 +-                                      
   sandbox/conversion/libs/conversion_ext/test/helper.hpp    |     2 +-                                      
   sandbox/conversion/libs/conversion_ext/test/interval.cpp  |     2 +-                                      
   sandbox/conversion/libs/conversion_ext/test/optional.cpp  |     4 ++--                                    
   sandbox/conversion/libs/conversion_ext/test/rational.cpp  |     2 +-                                      
   6 files changed, 8 insertions(+), 6 deletions(-)

Modified: sandbox/conversion/libs/conversion_ext/test/Jamfile.v2
==============================================================================
--- sandbox/conversion/libs/conversion_ext/test/Jamfile.v2	(original)
+++ sandbox/conversion/libs/conversion_ext/test/Jamfile.v2	2011-07-20 13:17:14 EDT (Wed, 20 Jul 2011)
@@ -40,6 +40,8 @@
         <toolset>msvc:<cxxflags>/wd4127
         <toolset>msvc:<cxxflags>/wd4244
         <toolset>msvc:<cxxflags>-D_SCL_SECURE_NO_WARNINGS
+	<define>BOOST_CONVERSION_DOUBLE_CP
+
 
 ;
 

Modified: sandbox/conversion/libs/conversion_ext/test/extrinsec.cpp
==============================================================================
--- sandbox/conversion/libs/conversion_ext/test/extrinsec.cpp	(original)
+++ sandbox/conversion/libs/conversion_ext/test/extrinsec.cpp	2011-07-20 13:17:14 EDT (Wed, 20 Jul 2011)
@@ -50,7 +50,7 @@
 BOOST_CONVERSION_DCL_DEFAULTS(C)
 
 
-#if defined(BOOST_CONVERSION_DOUBLE_CP)
+#if defined(BOOST_CONVERSION_DOUBLE_CP2)
   A convert_to(const B&, dummy::type_tag<A> const&) {
     return A();
   }

Modified: sandbox/conversion/libs/conversion_ext/test/helper.hpp
==============================================================================
--- sandbox/conversion/libs/conversion_ext/test/helper.hpp	(original)
+++ sandbox/conversion/libs/conversion_ext/test/helper.hpp	2011-07-20 13:17:14 EDT (Wed, 20 Jul 2011)
@@ -76,7 +76,7 @@
 
     }
 }
-#if defined(BOOST_CONVERSION_DOUBLE_CP)
+#if defined(BOOST_CONVERSION_DOUBLE_CP2)
 #ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
     A1 convert_to(const B1&, boost::conversion::dummy::type_tag<A1> const&) {
         return A1();

Modified: sandbox/conversion/libs/conversion_ext/test/interval.cpp
==============================================================================
--- sandbox/conversion/libs/conversion_ext/test/interval.cpp	(original)
+++ sandbox/conversion/libs/conversion_ext/test/interval.cpp	2011-07-20 13:17:14 EDT (Wed, 20 Jul 2011)
@@ -34,7 +34,7 @@
     boost::numeric::interval<A1> a(1,4);
     boost::numeric::interval<B1> b(1,4);
     boost::conversion::assign_to(a,b);
-#if defined(BOOST_CONVERSION_DOUBLE_CP)
+#if defined(BOOST_CONVERSION_DOUBLE_CP2)
     assign_to(a,b);
 #endif
     boost::conversion::assign_to(a,boost::numeric::interval<B1>(b1,b2));

Modified: sandbox/conversion/libs/conversion_ext/test/optional.cpp
==============================================================================
--- sandbox/conversion/libs/conversion_ext/test/optional.cpp	(original)
+++ sandbox/conversion/libs/conversion_ext/test/optional.cpp	2011-07-20 13:17:14 EDT (Wed, 20 Jul 2011)
@@ -29,7 +29,7 @@
 #endif
 
 
-#if defined(BOOST_CONVERSION_DOUBLE_CP)
+#if defined(BOOST_CONVERSION_DOUBLE_CP2)
 struct A1{};
 struct B1{};
 struct C1{};
@@ -134,7 +134,7 @@
     boost::conversion::assign_to(a, boost::optional<B1>(b1));
     BOOST_TEST(a);
   }
-#if defined(BOOST_CONVERSION_DOUBLE_CP)
+#if defined(BOOST_CONVERSION_DOUBLE_CP2)
   { // assign_to can be used when found by ADL
     B1 b1;
     boost::optional<A1> a;

Modified: sandbox/conversion/libs/conversion_ext/test/rational.cpp
==============================================================================
--- sandbox/conversion/libs/conversion_ext/test/rational.cpp	(original)
+++ sandbox/conversion/libs/conversion_ext/test/rational.cpp	2011-07-20 13:17:14 EDT (Wed, 20 Jul 2011)
@@ -35,7 +35,7 @@
     boost::rational<B1> b(1,2);
     boost::conversion::assign_to(a, b);
     boost::conversion::assign_to(a, boost::rational<B1>(b1,b2));
-#if defined(BOOST_CONVERSION_DOUBLE_CP)
+#if defined(BOOST_CONVERSION_DOUBLE_CP2)
     assign_to(a, b);
 #endif
 }