Index: bind_tests_advanced.cpp =================================================================== --- bind_tests_advanced.cpp (revision 53158) +++ bind_tests_advanced.cpp (working copy) @@ -27,7 +27,8 @@ #include -using namespace boost::lambda; +using namespace boost::lambda; +namespace bl = boost::lambda; int sum_0() { return 0; } int sum_1(int a) { return a; } @@ -91,7 +92,7 @@ // This would result in; // bind(_1 + 1, _1)(make_const(100)) , which would be a compile time error - return bind(unlambda(f), _1)(make_const(100)); + return bl::bind(unlambda(f), _1)(make_const(100)); // for other functors than lambda functors, unlambda has no effect // (except for making them const) @@ -116,11 +117,11 @@ BOOST_CHECK(call_with_101(_1 + 1) == 102); - BOOST_CHECK(call_with_100(bind(std_functor(std::bind1st(std::plus(), 1)), _1)) == 101); + BOOST_CHECK(call_with_100(bl::bind(std_functor(std::bind1st(std::plus(), 1)), _1)) == 101); // std_functor insturcts LL that the functor defines a result_type typedef // rather than a sig template. - bind(std_functor(std::plus()), _1, _2)(i, i); + bl::bind(std_functor(std::plus()), _1, _2)(i, i); } Index: bind_tests_simple.cpp =================================================================== --- bind_tests_simple.cpp (revision 53158) +++ bind_tests_simple.cpp (working copy) @@ -18,11 +18,9 @@ #include +using namespace boost::lambda; - using namespace std; - using namespace boost::lambda; - int sum_of_args_0() { return 0; } int sum_of_args_1(int a) { return a; } int sum_of_args_2(int a, int b) { return a+b; } Index: bind_tests_simple_f_refs.cpp =================================================================== --- bind_tests_simple_f_refs.cpp (revision 53158) +++ bind_tests_simple_f_refs.cpp (working copy) @@ -18,11 +18,9 @@ #include +using namespace boost::lambda; - using namespace std; - using namespace boost::lambda; - int sum_of_args_0() { return 0; } int sum_of_args_1(int a) { return a; } int sum_of_args_2(int a, int b) { return a+b; } Index: constructor_tests.cpp =================================================================== --- constructor_tests.cpp (revision 53158) +++ constructor_tests.cpp (working copy) @@ -29,6 +29,7 @@ #endif using namespace boost::lambda; +namespace bl = boost::lambda; template bool check_tuple(int n, const T& t) @@ -248,7 +249,7 @@ std::vector > v; std::transform(x.begin(), x.end(), y.begin(), std::back_inserter(v), - bind(constructor >(), _1, _2) ); + bl::bind(constructor >(), _1, _2) ); } int test_main(int, char *[]) {