From 36055f654f555c19a0857ce4ac51433206cedf78 Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Thu, 14 Apr 2011 05:05:08 +0000 Subject: [PATCH] [phoenix] fixed some ADL hickups [SVN r71239] --- include/boost/phoenix/core/function_equal.hpp | 2 +- .../bind_stateful_test.cpp | 58 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/boost/phoenix/core/function_equal.hpp b/include/boost/phoenix/core/function_equal.hpp index e8e289c..9f623c0 100644 --- a/include/boost/phoenix/core/function_equal.hpp +++ b/include/boost/phoenix/core/function_equal.hpp @@ -75,7 +75,7 @@ namespace boost { namespace phoenix > , proto::otherwise > - , test() + , proto::call > > {}; diff --git a/test/boost_bind_compatibility/bind_stateful_test.cpp b/test/boost_bind_compatibility/bind_stateful_test.cpp index 83d860f..b00ac92 100644 --- a/test/boost_bind_compatibility/bind_stateful_test.cpp +++ b/test/boost_bind_compatibility/bind_stateful_test.cpp @@ -160,49 +160,49 @@ using boost::phoenix::ref; 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 @@ void stateful_function_test() { 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()