Subject: [Boost-commit] svn:boost r71239 - in trunk: boost/phoenix/core libs/phoenix/test/boost_bind_compatibility
From: thom.heller_at_[hidden]
Date: 2011-04-14 01:05:09
Author: theller
Date: 2011-04-14 01:05:08 EDT (Thu, 14 Apr 2011)
New Revision: 71239
URL: http://svn.boost.org/trac/boost/changeset/71239
Log:
[phoenix] fixed some ADL hickups
Text files modified:
trunk/boost/phoenix/core/function_equal.hpp | 2
trunk/libs/phoenix/test/boost_bind_compatibility/bind_stateful_test.cpp | 58 ++++++++++++++++++++--------------------
2 files changed, 30 insertions(+), 30 deletions(-)
Modified: trunk/boost/phoenix/core/function_equal.hpp
==============================================================================
--- trunk/boost/phoenix/core/function_equal.hpp (original)
+++ trunk/boost/phoenix/core/function_equal.hpp 2011-04-14 01:05:08 EDT (Thu, 14 Apr 2011)
@@ -75,7 +75,7 @@
>
, proto::otherwise<test(proto::_, proto::_state)>
>
- , test()
+ , proto::call<phoenix::detail::test()>
>
>
{};
Modified: trunk/libs/phoenix/test/boost_bind_compatibility/bind_stateful_test.cpp
==============================================================================
--- trunk/libs/phoenix/test/boost_bind_compatibility/bind_stateful_test.cpp (original)
+++ trunk/libs/phoenix/test/boost_bind_compatibility/bind_stateful_test.cpp 2011-04-14 01:05:08 EDT (Thu, 14 Apr 2011)
@@ -160,49 +160,49 @@
void stateful_function_object_test()
{
- test( bind( X() ), 0, 17041 );
- test( bind( X(), 1 ), 0, 1 );
- test( bind( X(), 1, 2 ), 0, 1+2 );
- test( bind( X(), 1, 2, 3 ), 0, 1+2+3 );
- test( bind( X(), 1, 2, 3, 4 ), 0, 1+2+3+4 );
- test( bind( X(), 1, 2, 3, 4, 5 ), 0, 1+2+3+4+5 );
- test( bind( X(), 1, 2, 3, 4, 5, 6 ), 0, 1+2+3+4+5+6 );
- test( bind( X(), 1, 2, 3, 4, 5, 6, 7 ), 0, 1+2+3+4+5+6+7 );
- test( bind( X(), 1, 2, 3, 4, 5, 6, 7, 8 ), 0, 1+2+3+4+5+6+7+8 );
- test( bind( X(), 1, 2, 3, 4, 5, 6, 7, 8, 9 ), 0, 1+2+3+4+5+6+7+8+9 );
+ ::test( bind( X() ), 0, 17041 );
+ ::test( bind( X(), 1 ), 0, 1 );
+ ::test( bind( X(), 1, 2 ), 0, 1+2 );
+ ::test( bind( X(), 1, 2, 3 ), 0, 1+2+3 );
+ ::test( bind( X(), 1, 2, 3, 4 ), 0, 1+2+3+4 );
+ ::test( bind( X(), 1, 2, 3, 4, 5 ), 0, 1+2+3+4+5 );
+ ::test( bind( X(), 1, 2, 3, 4, 5, 6 ), 0, 1+2+3+4+5+6 );
+ ::test( bind( X(), 1, 2, 3, 4, 5, 6, 7 ), 0, 1+2+3+4+5+6+7 );
+ ::test( bind( X(), 1, 2, 3, 4, 5, 6, 7, 8 ), 0, 1+2+3+4+5+6+7+8 );
+ ::test( bind( X(), 1, 2, 3, 4, 5, 6, 7, 8, 9 ), 0, 1+2+3+4+5+6+7+8+9 );
X x;
int n = x.state();
- test( bind( ref(x) ), n, 17041 );
+ ::test( bind( ref(x) ), n, 17041 );
n += 3 * 17041;
- test( bind( ref(x), 1 ), n, 1 );
+ ::test( bind( ref(x), 1 ), n, 1 );
n += 3*1;
- test( bind( ref(x), 1, 2 ), n, 1+2 );
+ ::test( bind( ref(x), 1, 2 ), n, 1+2 );
n += 3*(1+2);
- test( bind( ref(x), 1, 2, 3 ), n, 1+2+3 );
+ ::test( bind( ref(x), 1, 2, 3 ), n, 1+2+3 );
n += 3*(1+2+3);
- test( bind( ref(x), 1, 2, 3, 4 ), n, 1+2+3+4 );
+ ::test( bind( ref(x), 1, 2, 3, 4 ), n, 1+2+3+4 );
n += 3*(1+2+3+4);
- test( bind( ref(x), 1, 2, 3, 4, 5 ), n, 1+2+3+4+5 );
+ ::test( bind( ref(x), 1, 2, 3, 4, 5 ), n, 1+2+3+4+5 );
n += 3*(1+2+3+4+5);
- test( bind( ref(x), 1, 2, 3, 4, 5, 6 ), n, 1+2+3+4+5+6 );
+ ::test( bind( ref(x), 1, 2, 3, 4, 5, 6 ), n, 1+2+3+4+5+6 );
n += 3*(1+2+3+4+5+6);
- test( bind( ref(x), 1, 2, 3, 4, 5, 6, 7 ), n, 1+2+3+4+5+6+7 );
+ ::test( bind( ref(x), 1, 2, 3, 4, 5, 6, 7 ), n, 1+2+3+4+5+6+7 );
n += 3*(1+2+3+4+5+6+7);
- test( bind( ref(x), 1, 2, 3, 4, 5, 6, 7, 8 ), n, 1+2+3+4+5+6+7+8 );
+ ::test( bind( ref(x), 1, 2, 3, 4, 5, 6, 7, 8 ), n, 1+2+3+4+5+6+7+8 );
n += 3*(1+2+3+4+5+6+7+8);
- test( bind( ref(x), 1, 2, 3, 4, 5, 6, 7, 8, 9 ), n, 1+2+3+4+5+6+7+8+9 );
+ ::test( bind( ref(x), 1, 2, 3, 4, 5, 6, 7, 8, 9 ), n, 1+2+3+4+5+6+7+8+9 );
n += 3*(1+2+3+4+5+6+7+8+9);
BOOST_TEST( x.state() == n );
@@ -212,15 +212,15 @@
{
using boost::phoenix::ref;
- test( bind( f0, 0), 0, 17041 );
- test( bind( f1, 0, 1 ), 0, 1 );
- test( bind( f2, 0, 1, 2 ), 0, 1+2 );
- test( bind( f3, 0, 1, 2, 3 ), 0, 1+2+3 );
- test( bind( f4, 0, 1, 2, 3, 4 ), 0, 1+2+3+4 );
- test( bind( f5, 0, 1, 2, 3, 4, 5 ), 0, 1+2+3+4+5 );
- test( bind( f6, 0, 1, 2, 3, 4, 5, 6 ), 0, 1+2+3+4+5+6 );
- test( bind( f7, 0, 1, 2, 3, 4, 5, 6, 7 ), 0, 1+2+3+4+5+6+7 );
- test( bind( f8, 0, 1, 2, 3, 4, 5, 6, 7, 8 ), 0, 1+2+3+4+5+6+7+8 );
+ ::test( bind( f0, 0), 0, 17041 );
+ ::test( bind( f1, 0, 1 ), 0, 1 );
+ ::test( bind( f2, 0, 1, 2 ), 0, 1+2 );
+ ::test( bind( f3, 0, 1, 2, 3 ), 0, 1+2+3 );
+ ::test( bind( f4, 0, 1, 2, 3, 4 ), 0, 1+2+3+4 );
+ ::test( bind( f5, 0, 1, 2, 3, 4, 5 ), 0, 1+2+3+4+5 );
+ ::test( bind( f6, 0, 1, 2, 3, 4, 5, 6 ), 0, 1+2+3+4+5+6 );
+ ::test( bind( f7, 0, 1, 2, 3, 4, 5, 6, 7 ), 0, 1+2+3+4+5+6+7 );
+ ::test( bind( f8, 0, 1, 2, 3, 4, 5, 6, 7, 8 ), 0, 1+2+3+4+5+6+7+8 );
}
int main()