From a60de56828baf82a064d223ec02711b972b8a0ee Mon Sep 17 00:00:00 2001
From: Aleksey Gurtovoy <agurtovoy@meta-comm.com>
Date: Tue, 7 Sep 2004 12:07:57 +0000
Subject: [PATCH] Visual Age fixes

[SVN r24956]
---
 include/boost/mpl/aux_/filter_iter.hpp      |  4 +--
 include/boost/mpl/aux_/joint_iter.hpp       |  8 ++---
 include/boost/mpl/aux_/range_c/iterator.hpp |  4 +--
 include/boost/mpl/aux_/transform_iter.hpp   |  4 +--
 include/boost/mpl/list/aux_/iterator.hpp    |  2 +-
 include/boost/mpl/pair_view.hpp             | 34 ++++++++++-----------
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/include/boost/mpl/aux_/filter_iter.hpp b/include/boost/mpl/aux_/filter_iter.hpp
index 912654c..8c117af 100644
--- a/include/boost/mpl/aux_/filter_iter.hpp
+++ b/include/boost/mpl/aux_/filter_iter.hpp
@@ -60,7 +60,7 @@ struct filter_iter
     typedef Iterator base;
     typedef forward_iterator_tag category;
     typedef typename aux::next_filter_iter<
-          typename next<base>::type
+          typename mpl::next<base>::type
         , LastIterator
         , Predicate
         >::type next;
@@ -93,7 +93,7 @@ struct filter_iter_impl
         typedef Iterator base;
         typedef forward_iterator_tag category;
         typedef typename next_filter_iter<
-              typename next<Iterator>::type
+              typename mpl::next<Iterator>::type
             , LastIterator
             , Predicate
             >::type next;
diff --git a/include/boost/mpl/aux_/joint_iter.hpp b/include/boost/mpl/aux_/joint_iter.hpp
index a09b423..65caef6 100644
--- a/include/boost/mpl/aux_/joint_iter.hpp
+++ b/include/boost/mpl/aux_/joint_iter.hpp
@@ -37,7 +37,7 @@ struct joint_iter
     typedef Iterator1 base;
     typedef forward_iterator_tag category;
     typedef joint_iter<
-          typename next<base>::type
+          typename mpl::next<base>::type
         , LastIterator1
         , Iterator2
         > next;
@@ -56,7 +56,7 @@ struct joint_iter<LastIterator1,LastIterator1,Iterator2>
     typedef joint_iter<
           LastIterator1
         , LastIterator1
-        , typename next<base>::type
+        , typename mpl::next<base>::type
         > next;
 
     typedef typename deref<base>::type type;
@@ -85,7 +85,7 @@ template< bool > struct joint_iter_impl
         typedef Iterator1 base;
         typedef forward_iterator_tag category;
         typedef joint_iter<
-              typename next<Iterator1>::type
+              typename mpl::next<Iterator1>::type
             , LastIterator1
             , Iterator2
             > next;
@@ -108,7 +108,7 @@ template<> struct joint_iter_impl<true>
         typedef joint_iter<
               LastIterator1
             , LastIterator1
-            , typename next<Iterator2>::type
+            , typename mpl::next<Iterator2>::type
             > next;
 
         typedef typename deref<Iterator2>::type type;
diff --git a/include/boost/mpl/aux_/range_c/iterator.hpp b/include/boost/mpl/aux_/range_c/iterator.hpp
index b61501c..11f4b91 100644
--- a/include/boost/mpl/aux_/range_c/iterator.hpp
+++ b/include/boost/mpl/aux_/range_c/iterator.hpp
@@ -29,8 +29,8 @@ struct rc_iter
     typedef random_access_iterator_tag category;
     typedef N type;
 
-    typedef rc_iter<typename next<N>::type> next;
-    typedef rc_iter<typename prior<N>::type> prior;
+    typedef rc_iter<typename mpl::next<N>::type> next;
+    typedef rc_iter<typename mpl::prior<N>::type> prior;
 
     template< typename D >
     struct BOOST_MPL_AUX_ITERATOR_ADVANCE
diff --git a/include/boost/mpl/aux_/transform_iter.hpp b/include/boost/mpl/aux_/transform_iter.hpp
index 59ca315..1d5687a 100644
--- a/include/boost/mpl/aux_/transform_iter.hpp
+++ b/include/boost/mpl/aux_/transform_iter.hpp
@@ -37,7 +37,7 @@ struct transform_iter
 {
     typedef Iterator base;
     typedef forward_iterator_tag category;
-    typedef transform_iter< typename next<base>::type,LastIterator,F > next;
+    typedef transform_iter< typename mpl::next<base>::type,LastIterator,F > next;
     
     typedef typename apply1<
           F
@@ -76,7 +76,7 @@ struct transform_iter_impl
     {
         typedef Iterator base;
         typedef forward_iterator_tag category;
-        typedef transform_iter< typename next<Iterator>::type,LastIterator,F > next;
+        typedef transform_iter< typename mpl::next<Iterator>::type,LastIterator,F > next;
         
         typedef typename apply1<
               F
diff --git a/include/boost/mpl/list/aux_/iterator.hpp b/include/boost/mpl/list/aux_/iterator.hpp
index 387eb13..17810dc 100644
--- a/include/boost/mpl/list/aux_/iterator.hpp
+++ b/include/boost/mpl/list/aux_/iterator.hpp
@@ -27,7 +27,7 @@ struct l_iter
     typedef aux::l_iter_tag tag;
     typedef forward_iterator_tag category;
     typedef typename Node::item type;
-    typedef l_iter<typename next<Node>::type> next;
+    typedef l_iter< typename mpl::next<Node>::type > next;
 };
 
 template<> struct l_iter<l_end>
diff --git a/include/boost/mpl/pair_view.hpp b/include/boost/mpl/pair_view.hpp
index 77e5ff1..575721f 100644
--- a/include/boost/mpl/pair_view.hpp
+++ b/include/boost/mpl/pair_view.hpp
@@ -41,8 +41,8 @@ struct pair_iter_ops
 {
     template< typename I1, typename I2 > struct result_
     {
-        typedef typename next<I1>::type i1_;
-        typedef typename next<I2>::type i2_;
+        typedef typename mpl::next<I1>::type i1_;
+        typedef typename mpl::next<I2>::type i2_;
         typedef pair_iter<i1_,i2_,Category> next;
     };
 };
@@ -54,12 +54,12 @@ struct pair_iter_ops<bidirectional_iterator_tag>
     {
         typedef bidirectional_iterator_tag category;
 
-        typedef typename next<I1>::type i1_;
-        typedef typename next<I2>::type i2_;
+        typedef typename mpl::next<I1>::type i1_;
+        typedef typename mpl::next<I2>::type i2_;
         typedef pair_iter<i1_,i2_,category> next;
 
-        typedef typename prior<I1>::type k1_;
-        typedef typename prior<I2>::type k2_;
+        typedef typename mpl::prior<I1>::type k1_;
+        typedef typename mpl::prior<I2>::type k2_;
         typedef pair_iter<k1_,k2_,category> prior;
     };
 };
@@ -71,12 +71,12 @@ struct pair_iter_ops<random_access_iterator_tag>
     {
         typedef random_access_iterator_tag category;
 
-        typedef typename next<I1>::type i1_;
-        typedef typename next<I2>::type i2_;
+        typedef typename mpl::next<I1>::type i1_;
+        typedef typename mpl::next<I2>::type i2_;
         typedef pair_iter<i1_,i2_,category> next;
 
-        typedef typename prior<I1>::type k1_;
-        typedef typename prior<I2>::type k2_;
+        typedef typename mpl::prior<I1>::type k1_;
+        typedef typename mpl::prior<I2>::type k2_;
         typedef pair_iter<k1_,k2_,category> prior;
 
         template< typename Distance > struct BOOST_MPL_AUX_ITERATOR_ADVANCE
@@ -112,30 +112,30 @@ struct pair_iter
 template< typename I1, typename I2, typename C >
 struct next< pair_iter<I1,I2,C> >
 {
-    typedef typename next<I1>::type i1_;
-    typedef typename next<I2>::type i2_;
+    typedef typename mpl::next<I1>::type i1_;
+    typedef typename mpl::next<I2>::type i2_;
     typedef pair_iter<i1_,i2_,C> type;
 };
 
 template< typename I1, typename I2, typename C >
 struct prior< pair_iter<I1,I2,C> >
 {
-    typedef typename prior<I1>::type i1_;
-    typedef typename prior<I2>::type i2_;
+    typedef typename mpl::prior<I1>::type i1_;
+    typedef typename mpl::prior<I2>::type i2_;
     typedef pair_iter<i1_,i2_,C> type;
 };
 
 template< typename I1, typename I2, typename C, typename Distance >
 struct advance< pair_iter<I1,I2,C>,Distance>
 {
-    typedef typename advance<I1,Distance>::type iter1_;
-    typedef typename advance<I2,Distance>::type iter2_;
+    typedef typename mpl::advance<I1,Distance>::type iter1_;
+    typedef typename mpl::advance<I2,Distance>::type iter2_;
     typedef pair_iter<iter1_,iter2_,C> type;
 };
 
 template< typename I1, typename I2, typename K1, typename K2, typename C >
 struct distance< pair_iter<I1,I2,C>, pair_iter<K1,K2,C> >
-    : distance<K1,I1>
+    : mpl::distance<K1,I1>
 {
 };