--- boost/iterator/iterator_facade.hpp~	Mon Jan 26 10:54:00 2004
+++ boost/iterator/iterator_facade.hpp	Fri Apr  2 16:35:51 2004
@@ -41,7 +41,7 @@
 {
   // This forward declaration is required for the friend declaration
   // in iterator_core_access
-  template <class I, class V, class TC, class R, class D> class iterator_facade;
+  template <class I_type, class V_type, class TC_type, class R_type, class D_type> class iterator_facade;
 
   namespace detail
   {
@@ -50,7 +50,7 @@
     // parameters.
     struct always_bool2
     {
-        template <class T, class U>
+        template <class T_type, class U_type>
         struct apply
         {
             typedef bool type;
@@ -124,15 +124,15 @@
     // produce a (constant) lvalue to which a pointer can be formed. We do that by
     // returning an instantiation of this special proxy class template.
 
-    template <class T>
+    template <class T_type>
     struct operator_arrow_proxy
     {
-        operator_arrow_proxy(T const* px) : m_value(*px) {}
-        const T* operator->() const { return &m_value; }
+        operator_arrow_proxy(T_type const* px) : m_value(*px) {}
+        const T_type* operator->() const { return &m_value; }
         // This function is needed for MWCW and BCC, which won't call operator->
         // again automatically per 13.3.1.2 para 8
-        operator const T*() const { return &m_value; }
-        T m_value;
+        operator const T_type*() const { return &m_value; }
+        T_type m_value;
     };
 
     // A metafunction that gets the result type for operator->.  Also
@@ -229,22 +229,22 @@
 
     struct choose_difference_type
     {
-        template <class I1, class I2>
+        template <class I1_type, class I2_type>
         struct apply
           :
 # ifdef BOOST_NO_ONE_WAY_ITERATOR_INTEROP
-          iterator_difference<I1>
+          iterator_difference<I1_type>
 # elif BOOST_WORKAROUND(BOOST_MSVC, == 1200)
           mpl::if_<
-              is_convertible<I2,I1>
-            , typename I1::difference_type
-            , typename I2::difference_type
+              is_convertible<I2_type,I1_type>
+            , typename I1_type::difference_type
+            , typename I2_type::difference_type
           >
 # else 
           mpl::apply_if<
-              is_convertible<I2,I1>
-            , iterator_difference<I1>
-            , iterator_difference<I2>
+              is_convertible<I2_type,I1_type>
+            , iterator_difference<I1_type>
+            , iterator_difference<I2_type>
           >
 # endif 
         {};
@@ -257,30 +257,30 @@
 # ifdef BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY
 #  define BOOST_ITERATOR_FACADE_INTEROP_HEAD(prefix, op, result_type)   \
     template <                                                          \
-        class Derived1, class V1, class TC1, class R1, class D1         \
-      , class Derived2, class V2, class TC2, class R2, class D2         \
+        class Derived1, class V1_type, class TC1_type, class R1_type, class D1_type         \
+      , class Derived2, class V2_type, class TC2_type, class R2_type, class D2_type         \
     >                                                                   \
     prefix typename mpl::apply2<result_type,Derived1,Derived2>::type    \
     operator op(                                                        \
-        iterator_facade<Derived1, V1, TC1, R1, D1> const& lhs           \
-      , iterator_facade<Derived2, V2, TC2, R2, D2> const& rhs)
+        iterator_facade<Derived1, V1_type, TC1_type, R1_type, D1_type> const& lhs           \
+      , iterator_facade<Derived2, V2_type, TC2_type, R2_type, D2_type> const& rhs)
 # else 
 #  define BOOST_ITERATOR_FACADE_INTEROP_HEAD(prefix, op, result_type)   \
     template <                                                          \
-        class Derived1, class V1, class TC1, class R1, class D1         \
-      , class Derived2, class V2, class TC2, class R2, class D2         \
+        class Derived1, class V1_type, class TC1_type, class R1_type, class D1_type         \
+      , class Derived2, class V2_type, class TC2_type, class R2_type, class D2_type         \
     >                                                                   \
     prefix typename detail::enable_if_interoperable<                    \
         Derived1, Derived2                                              \
       , typename mpl::apply2<result_type,Derived1,Derived2>::type       \
     >::type                                                             \
     operator op(                                                        \
-        iterator_facade<Derived1, V1, TC1, R1, D1> const& lhs           \
-      , iterator_facade<Derived2, V2, TC2, R2, D2> const& rhs)
+        iterator_facade<Derived1, V1_type, TC1_type, R1_type, D1_type> const& lhs           \
+      , iterator_facade<Derived2, V2_type, TC2_type, R2_type, D2_type> const& rhs)
 # endif 
 
 #  define BOOST_ITERATOR_FACADE_PLUS_HEAD(prefix,args)              \
-    template <class Derived, class V, class TC, class R, class D>   \
+    template <class Derived, class V_type, class TC_type, class R_type, class D_type>   \
     prefix Derived operator+ args
 
   //
@@ -301,7 +301,7 @@
    public:
 # else
       
-      template <class I, class V, class TC, class R, class D> friend class iterator_facade;
+      template <class I_type, class V_type, class TC_type, class R_type, class D_type> friend class iterator_facade;
 
 #  define BOOST_ITERATOR_FACADE_RELATION(op)                                \
       BOOST_ITERATOR_FACADE_INTEROP_HEAD(friend,op, detail::always_bool2);
@@ -321,7 +321,7 @@
 
       BOOST_ITERATOR_FACADE_PLUS_HEAD(
           friend                                
-          , (iterator_facade<Derived, V, TC, R, D> const&
+          , (iterator_facade<Derived, V_type, TC_type, R_type, D_type> const&
            , typename Derived::difference_type)
       )
       ;
@@ -329,7 +329,7 @@
       BOOST_ITERATOR_FACADE_PLUS_HEAD(
           friend
         , (typename Derived::difference_type
-           , iterator_facade<Derived, V, TC, R, D> const&)
+           , iterator_facade<Derived, V_type, TC_type, R_type, D_type> const&)
       )
       ;
 
@@ -646,13 +646,13 @@
   }
 
 BOOST_ITERATOR_FACADE_PLUS((
-  iterator_facade<Derived, V, TC, R, D> const& i
+  iterator_facade<Derived, V_type, TC_type, R_type, D_type> const& i
   , typename Derived::difference_type n
 ))
 
 BOOST_ITERATOR_FACADE_PLUS((
     typename Derived::difference_type n
-    , iterator_facade<Derived, V, TC, R, D> const& i
+    , iterator_facade<Derived, V_type, TC_type, R_type, D_type> const& i
 ))
 # undef BOOST_ITERATOR_FACADE_PLUS
 # undef BOOST_ITERATOR_FACADE_PLUS_HEAD