Ticket #3074: fusion_vc10.patch

libs/fusion/test/sequence/cons.cpp

@@ -25 +25 @@
 main()
 {
     using namespace boost::fusion;
+    namespace bf = boost::fusion;
     using boost::is_same;
 
     std::cout << tuple_open('[');
@@ -39 +40 @@
             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 + ' ' + ' '));
     }
 
     {

libs/fusion/test/sequence/iterator_range.cpp

@@ -28 +28 @@
 main()
 {
     using namespace boost::fusion;
+    namespace bf = boost::fusion;
 
     std::cout << tuple_open('[');
     std::cout << tuple_close(']');
@@ -104 +105 @@
         BOOST_MPL_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<range_type>::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();

libs/fusion/test/sequence/joint_view.cpp

@@ -176 +176 @@
 
         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();

libs/fusion/test/sequence/map.cpp

@@ -27 +27 @@
 main()
 {
     using namespace boost::fusion;
+    namespace bf = boost::fusion;
     using namespace boost;
     using namespace std;
     using boost::fusion::pair;
@@ -66 +67 @@
         BOOST_STATIC_ASSERT((!result_of::has_key<map_type, std::string>::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<result_of::key_of<result_of::begin<map_type>::type>::type, int>::value));
-        BOOST_STATIC_ASSERT((is_same<result_of::key_of<result_of::next<result_of::begin<map_type>::type>::type>::type, double>::value));
-        BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::begin<map_type>::type>::type, char>::value));
-        BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::next<result_of::begin<map_type>::type>::type>::type, std::string>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::begin<map_type>::type>::type, int>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::next<result_of::begin<map_type>::type>::type>::type, double>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::begin<map_type>::type>::type, char>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<map_type>::type>::type>::type, std::string>::value));
     }
     
     {

libs/fusion/test/sequence/set.cpp

@@ -27 +27 @@
 main()
 {
     using namespace boost::fusion;
+    namespace bf = boost::fusion;
     using namespace boost;
     using namespace std;
     using boost::fusion::pair;
@@ -61 +62 @@
         BOOST_STATIC_ASSERT((!result_of::has_key<set_type, double>::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<result_of::key_of<result_of::begin<set_type>::type>::type, int>::value));
-        BOOST_STATIC_ASSERT((is_same<result_of::key_of<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
-        BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::begin<set_type>::type>::type, int>::value));
-        BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::begin<set_type>::type>::type, int>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::begin<set_type>::type>::type, int>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
     }
     
     {