Visual Age fixes

[SVN r24956]
This commit is contained in:
Aleksey Gurtovoy
2004-09-07 12:07:57 +00:00
parent ea5ff5dad2
commit a60de56828
6 changed files with 28 additions and 28 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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

View File

@@ -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

View File

@@ -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>

View File

@@ -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>
{
};