Pick less-likely names to avoid collisions on broken compilers

[SVN r18471]
This commit is contained in:
Dave Abrahams
2003-05-20 18:59:57 +00:00
parent 8688164a11
commit 5a7c65a762
2 changed files with 48 additions and 48 deletions

View File

@@ -117,9 +117,9 @@ struct vector_item<V,i>
namespace aux { namespace aux {
template<> struct vector_item_impl<i> template<> struct vector_item_impl<i>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::BOOST_PP_CAT(item,i) type; typedef typename V_::BOOST_PP_CAT(item,i) type;
}; };
}; };
} }
@@ -127,10 +127,10 @@ template<> struct vector_item_impl<i>
template<> template<>
struct at_traits< aux::vector_tag<i> > struct at_traits< aux::vector_tag<i> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };

View File

@@ -7,9 +7,9 @@ namespace mpl {
namespace aux { namespace aux {
template<> struct vector_item_impl<0> template<> struct vector_item_impl<0>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::item0 type; typedef typename V_::item0 type;
}; };
}; };
} }
@@ -17,10 +17,10 @@ template<> struct vector_item_impl<0>
template<> template<>
struct at_traits< aux::vector_tag< 0> > struct at_traits< aux::vector_tag< 0> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };
@@ -87,9 +87,9 @@ struct pop_front_traits< aux::vector_tag< 1> >
namespace aux { namespace aux {
template<> struct vector_item_impl<1> template<> struct vector_item_impl<1>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::item1 type; typedef typename V_::item1 type;
}; };
}; };
} }
@@ -97,10 +97,10 @@ template<> struct vector_item_impl<1>
template<> template<>
struct at_traits< aux::vector_tag< 1> > struct at_traits< aux::vector_tag< 1> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };
@@ -199,9 +199,9 @@ struct pop_front_traits< aux::vector_tag< 2> >
namespace aux { namespace aux {
template<> struct vector_item_impl<2> template<> struct vector_item_impl<2>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::item2 type; typedef typename V_::item2 type;
}; };
}; };
} }
@@ -209,10 +209,10 @@ template<> struct vector_item_impl<2>
template<> template<>
struct at_traits< aux::vector_tag< 2> > struct at_traits< aux::vector_tag< 2> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };
@@ -312,9 +312,9 @@ struct pop_front_traits< aux::vector_tag< 3> >
namespace aux { namespace aux {
template<> struct vector_item_impl<3> template<> struct vector_item_impl<3>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::item3 type; typedef typename V_::item3 type;
}; };
}; };
} }
@@ -322,10 +322,10 @@ template<> struct vector_item_impl<3>
template<> template<>
struct at_traits< aux::vector_tag< 3> > struct at_traits< aux::vector_tag< 3> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };
@@ -428,9 +428,9 @@ struct pop_front_traits< aux::vector_tag< 4> >
namespace aux { namespace aux {
template<> struct vector_item_impl<4> template<> struct vector_item_impl<4>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::item4 type; typedef typename V_::item4 type;
}; };
}; };
} }
@@ -438,10 +438,10 @@ template<> struct vector_item_impl<4>
template<> template<>
struct at_traits< aux::vector_tag< 4> > struct at_traits< aux::vector_tag< 4> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };
@@ -545,9 +545,9 @@ struct pop_front_traits< aux::vector_tag< 5> >
namespace aux { namespace aux {
template<> struct vector_item_impl<5> template<> struct vector_item_impl<5>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::item5 type; typedef typename V_::item5 type;
}; };
}; };
} }
@@ -555,10 +555,10 @@ template<> struct vector_item_impl<5>
template<> template<>
struct at_traits< aux::vector_tag< 5> > struct at_traits< aux::vector_tag< 5> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };
@@ -666,9 +666,9 @@ struct pop_front_traits< aux::vector_tag< 6> >
namespace aux { namespace aux {
template<> struct vector_item_impl<6> template<> struct vector_item_impl<6>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::item6 type; typedef typename V_::item6 type;
}; };
}; };
} }
@@ -676,10 +676,10 @@ template<> struct vector_item_impl<6>
template<> template<>
struct at_traits< aux::vector_tag< 6> > struct at_traits< aux::vector_tag< 6> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };
@@ -788,9 +788,9 @@ struct pop_front_traits< aux::vector_tag< 7> >
namespace aux { namespace aux {
template<> struct vector_item_impl<7> template<> struct vector_item_impl<7>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::item7 type; typedef typename V_::item7 type;
}; };
}; };
} }
@@ -798,10 +798,10 @@ template<> struct vector_item_impl<7>
template<> template<>
struct at_traits< aux::vector_tag< 7> > struct at_traits< aux::vector_tag< 7> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };
@@ -913,9 +913,9 @@ struct pop_front_traits< aux::vector_tag< 8> >
namespace aux { namespace aux {
template<> struct vector_item_impl<8> template<> struct vector_item_impl<8>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::item8 type; typedef typename V_::item8 type;
}; };
}; };
} }
@@ -923,10 +923,10 @@ template<> struct vector_item_impl<8>
template<> template<>
struct at_traits< aux::vector_tag< 8> > struct at_traits< aux::vector_tag< 8> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };
@@ -1039,9 +1039,9 @@ struct pop_front_traits< aux::vector_tag< 9> >
namespace aux { namespace aux {
template<> struct vector_item_impl<9> template<> struct vector_item_impl<9>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::item9 type; typedef typename V_::item9 type;
}; };
}; };
} }
@@ -1049,10 +1049,10 @@ template<> struct vector_item_impl<9>
template<> template<>
struct at_traits< aux::vector_tag< 9> > struct at_traits< aux::vector_tag< 9> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };
@@ -1168,9 +1168,9 @@ struct pop_front_traits< aux::vector_tag< 10> >
namespace aux { namespace aux {
template<> struct vector_item_impl<10> template<> struct vector_item_impl<10>
{ {
template< typename V > struct result_ template< typename V_ > struct result_
{ {
typedef typename V::item10 type; typedef typename V_::item10 type;
}; };
}; };
} }
@@ -1178,10 +1178,10 @@ template<> struct vector_item_impl<10>
template<> template<>
struct at_traits< aux::vector_tag< 10> > struct at_traits< aux::vector_tag< 10> >
{ {
template< typename V, typename N > struct algorithm template< typename V_, typename N > struct algorithm
{ {
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value> typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
::template result_<V>::type type; ::template result_<V_>::type type;
}; };
}; };