|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r73191 - in sandbox/conversion/libs/conversion_ext: example test
From: vicente.botet_at_[hidden]
Date: 2011-07-17 13:52:28
Author: viboes
Date: 2011-07-17 13:52:27 EDT (Sun, 17 Jul 2011)
New Revision: 73191
URL: http://svn.boost.org/trac/boost/changeset/73191
Log:
conversion: rename mcf by implicitly and mat to lvalue
Added:
sandbox/conversion/libs/conversion_ext/test/cyg.log (contents, props changed)
Text files modified:
sandbox/conversion/libs/conversion_ext/example/overload.cpp | 6 +++---
sandbox/conversion/libs/conversion_ext/test/extrinsec.cpp | 26 +++++++++++++-------------
sandbox/conversion/libs/conversion_ext/test/intrinsec.cpp | 6 +++---
sandbox/conversion/libs/conversion_ext/test/is_copy_assignable.cpp | 6 +++---
4 files changed, 22 insertions(+), 22 deletions(-)
Modified: sandbox/conversion/libs/conversion_ext/example/overload.cpp
==============================================================================
--- sandbox/conversion/libs/conversion_ext/example/overload.cpp (original)
+++ sandbox/conversion/libs/conversion_ext/example/overload.cpp 2011-07-17 13:52:27 EDT (Sun, 17 Jul 2011)
@@ -120,7 +120,7 @@
static void whichOverload()
{
T v;
- std::cout << f(mcf(v)) << " called" << std::endl;
+ std::cout << f(implicitly(v)) << " called" << std::endl;
}
};
//]
@@ -147,7 +147,7 @@
//]
}
-void mcf_extrinsic_test()
+void implicitly_extrinsic_test()
{
#if defined(BOOST_CONVERSION_MCF_ENABLED)
//[OVERLOAD_CPP_MCF
@@ -169,7 +169,7 @@
{
impl_intrinsic_test();
- mcf_extrinsic_test();
+ implicitly_extrinsic_test();
return 0;
}
Added: sandbox/conversion/libs/conversion_ext/test/cyg.log
==============================================================================
--- (empty file)
+++ sandbox/conversion/libs/conversion_ext/test/cyg.log 2011-07-17 13:52:27 EDT (Sun, 17 Jul 2011)
@@ -0,0 +1,16 @@
+warning: mismatched versions of Boost.Build engine and core
+warning: Boost.Build engine (bjam) is 03.1.19
+warning: Boost.Build core (at /cygdrive/d/boost/trunk/tools/build/v2) is 2011.04-svn
+...patience...
+...patience...
+...found 1636 targets...
+...updating 8 targets...
+gcc.compile.c++ ../../../bin.v2/libs/conversion_ext/test/overload.test/gcc-4.3.4/debug/overload.o
+gcc.compile.c++ ../../../bin.v2/libs/conversion_ext/test/overload.test/gcc-0x/debug/overload.o
+gcc.link ../../../bin.v2/libs/conversion_ext/test/overload.test/gcc-4.3.4/debug/overload.exe
+testing.capture-output ../../../bin.v2/libs/conversion_ext/test/overload.test/gcc-4.3.4/debug/overload.run
+**passed** ../../../bin.v2/libs/conversion_ext/test/overload.test/gcc-4.3.4/debug/overload.test
+gcc.link ../../../bin.v2/libs/conversion_ext/test/overload.test/gcc-0x/debug/overload.exe
+testing.capture-output ../../../bin.v2/libs/conversion_ext/test/overload.test/gcc-0x/debug/overload.run
+**passed** ../../../bin.v2/libs/conversion_ext/test/overload.test/gcc-0x/debug/overload.test
+...updated 8 targets...
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-17 13:52:27 EDT (Sun, 17 Jul 2011)
@@ -216,11 +216,11 @@
(void)y1_1;// remove warning: unused variable
#endif
#if defined(BOOST_CONVERSION_MCF_ENABLED)
- ICF_X y2(mcf(x));
+ ICF_X y2(implicitly(x));
(void)y2;// remove warning: unused variable
#endif
assign_to(y1,x);
- mat(y1) = x;
+ lvalue(y1) = x;
}
}
@@ -236,10 +236,10 @@
(void)y;// remove warning: unused variable
ECF_X y1_1(explicit_convert_to<ECF_X>(x));
(void)y1_1;// remove warning: unused variable
- //ECF_X y1_2(mcf(x)); // fail as there is no implicit conversion.
+ //ECF_X y1_2(implicitly(x)); // fail as there is no implicit conversion.
ECF_X y2 = explicit_convert_to<ECF_X>(x);
(void)y2;// remove warning: unused variable
- //mat(y2) = x; // fails as no implicit conversion
+ //lvalue(y2) = x; // fails as no implicit conversion
}
}
@@ -255,7 +255,7 @@
(void)x1_1;// remove warning: unused variable
#endif
#if defined(BOOST_CONVERSION_MCF_ENABLED)
- X x2(mcf(y));
+ X x2(implicitly(y));
(void)x2;// remove warning: unused variable
#endif
X x3=implicit_convert_to<X>(y);
@@ -265,11 +265,11 @@
(void)x3_1;// remove warning: unused variable
#endif
#if defined(BOOST_CONVERSION_MCF_ENABLED)
- X x4=mcf(y);
+ X x4=implicitly(y);
(void)x4;// remove warning: unused variable
#endif
assign_to(x1,y);
- mat(x1) = y;
+ lvalue(x1) = y;
}
}
@@ -291,7 +291,7 @@
AF_X y2;
//y2=x; // compile fails
assign_to(y2,x);
- mat(y2)=x;
+ lvalue(y2)=x;
}
}
////
@@ -315,7 +315,7 @@
A a;
//assign_to(a, b);
mca(a)= b;
- mat(a)= b;
+ lvalue(a)= b;
}
void explicit_chain_assign_to() {
@@ -325,7 +325,7 @@
A a;
assign_to(a, assign_to(b,c));
mca(a)= mca(b) = c;
- mat(a)= mat(b) = c;
+ lvalue(a)= lvalue(b) = c;
}
void implicit_conversion_via_mca() {
@@ -333,11 +333,11 @@
f(mca(c));
}
-void implicit_conversion_via_mcf() {
+void implicit_conversion_via_implicitly() {
using namespace boost::conversion;
C c;
#if defined(BOOST_CONVERSION_MCF_ENABLED)
- f(mcf(c));
+ f(implicitly(c));
#endif
f(convertible_to<B>(c));
}
@@ -365,7 +365,7 @@
explicit_assign_to();
explicit_chain_assign_to();
implicit_conversion_via_mca();
- implicit_conversion_via_mcf();
+ implicit_conversion_via_implicitly();
implicit_conversion_via_convertible_to();
implicit_conversion_via_sfinae();
#endif
Modified: sandbox/conversion/libs/conversion_ext/test/intrinsec.cpp
==============================================================================
--- sandbox/conversion/libs/conversion_ext/test/intrinsec.cpp (original)
+++ sandbox/conversion/libs/conversion_ext/test/intrinsec.cpp 2011-07-17 13:52:27 EDT (Sun, 17 Jul 2011)
@@ -174,11 +174,11 @@
ECF_X y1_1(explicit_convert_to<ECF_X>(x));
(void)y1_1; // WARNING removal
#if defined(BOOST_CONVERSION_MCF_ENABLED)
- //ECF_X y1_2(mcf(x)); // should fail as ambiguous: ECF_X(X) and ECF_X(ECF_X&const). fails only with gcc4.3. 0x
+ //ECF_X y1_2(implicitly(x)); // should fail as ambiguous: ECF_X(X) and ECF_X(ECF_X&const). fails only with gcc4.3. 0x
#endif
#if defined(BOOST_CONVERSION_MCF_ENABLED)
- //impl_cnv(mcf(x)); // fail as x is not implicit convertible to ECF_X.
+ //impl_cnv(implicitly(x)); // fail as x is not implicit convertible to ECF_X.
#endif
ECF_X y3 = explicit_convert_to<ECF_X>(x);
(void)y3; // WARNING removal
@@ -227,7 +227,7 @@
y2=x;
#if defined(BOOST_CONVERSION_ENABLE_CND)
assign_to(y2,x);
- mat(y2)=x;
+ lvalue(y2)=x;
#endif
}
{
Modified: sandbox/conversion/libs/conversion_ext/test/is_copy_assignable.cpp
==============================================================================
--- sandbox/conversion/libs/conversion_ext/test/is_copy_assignable.cpp (original)
+++ sandbox/conversion/libs/conversion_ext/test/is_copy_assignable.cpp 2011-07-17 13:52:27 EDT (Sun, 17 Jul 2011)
@@ -53,9 +53,9 @@
int main()
{
BOOST_STATIC_ASSERT(( boost::is_copy_assignable<int>::value));
- BOOST_STATIC_ASSERT((!boost::is_copy_assignable<const int>::value));
- BOOST_STATIC_ASSERT((!boost::is_copy_assignable<int[]>::value));
- BOOST_STATIC_ASSERT((!boost::is_copy_assignable<int[3]>::value));
+ //BOOST_STATIC_ASSERT((!boost::is_copy_assignable<const int>::value));
+ //BOOST_STATIC_ASSERT((!boost::is_copy_assignable<int[]>::value));
+ //BOOST_STATIC_ASSERT((!boost::is_copy_assignable<int[3]>::value));
BOOST_STATIC_ASSERT(( boost::is_copy_assignable<int&>::value));
BOOST_STATIC_ASSERT(( boost::is_copy_assignable<A>::value));
BOOST_STATIC_ASSERT(( boost::is_copy_assignable<bit_zero>::value));
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