some changes for conceptgcc-4.3

[SVN r37529]
This commit is contained in:
Eric Niebler
2007-04-28 21:22:55 +00:00
parent 4c4e91a3ce
commit 416b82b14a
4 changed files with 9 additions and 9 deletions

View File

@ -30,7 +30,7 @@ namespace boost { namespace fusion
typedef iterator_range<first_type, pos_type> left_type; typedef iterator_range<first_type, pos_type> left_type;
typedef iterator_range<pos_type, last_type> right_type; typedef iterator_range<pos_type, last_type> right_type;
typedef single_view<element_type> single_view; typedef fusion::single_view<element_type> single_view;
typedef joint_view<left_type, single_view const> left_insert_type; typedef joint_view<left_type, single_view const> left_insert_type;
typedef joint_view<left_insert_type, right_type> type; typedef joint_view<left_insert_type, right_type> type;
}; };

View File

@ -18,7 +18,7 @@ namespace boost { namespace fusion
template <typename Sequence, typename T> template <typename Sequence, typename T>
struct push_back struct push_back
{ {
typedef single_view<typename detail::as_fusion_element<T>::type> single_view; typedef fusion::single_view<typename detail::as_fusion_element<T>::type> single_view;
typedef joint_view<Sequence, single_view const> type; typedef joint_view<Sequence, single_view const> type;
}; };
} }

View File

@ -18,7 +18,7 @@ namespace boost { namespace fusion
template <typename Sequence, typename T> template <typename Sequence, typename T>
struct push_front struct push_front
{ {
typedef single_view<typename detail::as_fusion_element<T>::type> single_view; typedef fusion::single_view<typename detail::as_fusion_element<T>::type> single_view;
typedef joint_view<single_view const, Sequence> type; typedef joint_view<single_view const, Sequence> type;
}; };
} }

View File

@ -78,16 +78,16 @@ namespace boost { namespace fusion
explicit segmented_range(Sequence &sequence_) explicit segmented_range(Sequence &sequence_)
: sequence(sequence_type(sequence_)) : sequence(sequence_type(sequence_))
, where(fusion::begin(sequence)) , where_(fusion::begin(sequence))
{} {}
segmented_range(sequence_type sequence_, iterator_type const &where_) segmented_range(sequence_type sequence_, iterator_type const &wh)
: sequence(sequence_) : sequence(sequence_)
, where(where_) , where_(wh)
{} {}
sequence_type sequence; sequence_type sequence;
iterator_type where; iterator_type where_;
}; };
} }
@ -139,7 +139,7 @@ namespace boost { namespace fusion
typedef typename Sequence::iterator_type type; typedef typename Sequence::iterator_type type;
static type call(Sequence &seq) static type call(Sequence &seq)
{ {
return seq.where; return seq.where_;
} }
}; };
}; };
@ -175,7 +175,7 @@ namespace boost { namespace fusion
static type call(segmented_range<Sequence, Iterator, IsSegmented> const &rng) static type call(segmented_range<Sequence, Iterator, IsSegmented> const &rng)
{ {
return type(rng.sequence, fusion::next(rng.where)); return type(rng.sequence, fusion::next(rng.where_));
} }
}; };