Index: libs/fusion/test/sequence/cons.cpp =================================================================== --- libs/fusion/test/sequence/cons.cpp (revision 59666) +++ libs/fusion/test/sequence/cons.cpp (working copy) @@ -25,6 +25,7 @@ main() { using namespace boost::fusion; + namespace bf = boost::fusion; using boost::is_same; std::cout << tuple_open('['); @@ -39,18 +40,18 @@ make_cons(1, make_cons(hello)); BOOST_TEST((*begin(ns) == 1)); - BOOST_TEST((*next(begin(ns)) == hello)); + BOOST_TEST((*bf::next(begin(ns)) == hello)); *begin(ns) += 1; - *next(begin(ns)) += ' '; + *bf::next(begin(ns)) += ' '; BOOST_TEST((*begin(ns) == 2)); - BOOST_TEST((*next(begin(ns)) == hello + ' ')); + BOOST_TEST((*bf::next(begin(ns)) == hello + ' ')); for_each(ns, boost::lambda::_1 += ' '); BOOST_TEST((*begin(ns) == 2 + ' ')); - BOOST_TEST((*next(begin(ns)) == hello + ' ' + ' ')); + BOOST_TEST((*bf::next(begin(ns)) == hello + ' ' + ' ')); } { Index: libs/fusion/test/sequence/iterator_range.cpp =================================================================== --- libs/fusion/test/sequence/iterator_range.cpp (revision 59666) +++ libs/fusion/test/sequence/iterator_range.cpp (working copy) @@ -28,6 +28,7 @@ main() { using namespace boost::fusion; + namespace bf = boost::fusion; std::cout << tuple_open('['); std::cout << tuple_close(']'); @@ -104,9 +105,9 @@ BOOST_MPL_ASSERT((boost::is_same::type>::type>::type, char>)); std::cout << deref_data(begin(r)) << std::endl; - std::cout << deref_data(next(begin(r))) << std::endl; + std::cout << deref_data(bf::next(begin(r))) << std::endl; BOOST_TEST((deref_data(begin(r)) == "foo")); - BOOST_TEST((deref_data(next(begin(r))) == 'x')); + BOOST_TEST((deref_data(bf::next(begin(r))) == 'x')); } return boost::report_errors(); Index: libs/fusion/test/sequence/joint_view.cpp =================================================================== --- libs/fusion/test/sequence/joint_view.cpp (revision 59666) +++ libs/fusion/test/sequence/joint_view.cpp (working copy) @@ -176,10 +176,10 @@ std::cout << deref_data(begin(j)) << std::endl; std::cout << deref_data(boost::fusion::next(begin(j))) << std::endl; - std::cout << deref_data(next(boost::fusion::next(begin(j)))) << std::endl; + std::cout << deref_data(boost::fusion::next(boost::fusion::next(begin(j)))) << std::endl; BOOST_TEST((deref_data(begin(j)) == 0)); BOOST_TEST((deref_data(boost::fusion::next(begin(j))) == "foo")); - BOOST_TEST((deref_data(next(boost::fusion::next(begin(j)))) == 1.3f)); + BOOST_TEST((deref_data(boost::fusion::next(boost::fusion::next(begin(j)))) == 1.3f)); } return boost::report_errors(); Index: libs/fusion/test/sequence/map.cpp =================================================================== --- libs/fusion/test/sequence/map.cpp (revision 59666) +++ libs/fusion/test/sequence/map.cpp (working copy) @@ -27,6 +27,7 @@ main() { using namespace boost::fusion; + namespace bf = boost::fusion; using namespace boost; using namespace std; using boost::fusion::pair; @@ -66,15 +67,15 @@ BOOST_STATIC_ASSERT((!result_of::has_key::value)); std::cout << deref_data(begin(m)) << std::endl; - std::cout << deref_data(next(begin(m))) << std::endl; + std::cout << deref_data(bf::next(begin(m))) << std::endl; BOOST_TEST(deref_data(begin(m)) == 'X'); - BOOST_TEST(deref_data(next(begin(m))) == "Men"); + BOOST_TEST(deref_data(bf::next(begin(m))) == "Men"); - BOOST_STATIC_ASSERT((is_same::type>::type, int>::value)); - BOOST_STATIC_ASSERT((is_same::type>::type>::type, double>::value)); - BOOST_STATIC_ASSERT((is_same::type>::type, char>::value)); - BOOST_STATIC_ASSERT((is_same::type>::type>::type, std::string>::value)); + BOOST_STATIC_ASSERT((boost::is_same::type>::type, int>::value)); + BOOST_STATIC_ASSERT((boost::is_same::type>::type>::type, double>::value)); + BOOST_STATIC_ASSERT((boost::is_same::type>::type, char>::value)); + BOOST_STATIC_ASSERT((boost::is_same::type>::type>::type, std::string>::value)); } { Index: libs/fusion/test/sequence/set.cpp =================================================================== --- libs/fusion/test/sequence/set.cpp (revision 59666) +++ libs/fusion/test/sequence/set.cpp (working copy) @@ -27,6 +27,7 @@ main() { using namespace boost::fusion; + namespace bf = boost::fusion; using namespace boost; using namespace std; using boost::fusion::pair; @@ -61,15 +62,15 @@ BOOST_STATIC_ASSERT((!result_of::has_key::value)); std::cout << deref_data(begin(m)) << std::endl; - std::cout << deref_data(next(begin(m))) << std::endl; + std::cout << deref_data(bf::next(begin(m))) << std::endl; BOOST_TEST(deref_data(begin(m)) == 123); - BOOST_TEST(deref_data(next(begin(m))) == "Hola"); + BOOST_TEST(deref_data(bf::next(begin(m))) == "Hola"); - BOOST_STATIC_ASSERT((is_same::type>::type, int>::value)); - BOOST_STATIC_ASSERT((is_same::type>::type>::type, std::string>::value)); - BOOST_STATIC_ASSERT((is_same::type>::type, int>::value)); - BOOST_STATIC_ASSERT((is_same::type>::type>::type, std::string>::value)); + BOOST_STATIC_ASSERT((boost::is_same::type>::type, int>::value)); + BOOST_STATIC_ASSERT((boost::is_same::type>::type>::type, std::string>::value)); + BOOST_STATIC_ASSERT((boost::is_same::type>::type, int>::value)); + BOOST_STATIC_ASSERT((boost::is_same::type>::type>::type, std::string>::value)); } {