diff --git a/include/boost/fusion/algorithm/transformation/insert.hpp b/include/boost/fusion/algorithm/transformation/insert.hpp index 5b676538..ebe06f14 100644 --- a/include/boost/fusion/algorithm/transformation/insert.hpp +++ b/include/boost/fusion/algorithm/transformation/insert.hpp @@ -30,7 +30,7 @@ namespace boost { namespace fusion typedef iterator_range left_type; typedef iterator_range right_type; - typedef single_view single_view; + typedef fusion::single_view single_view; typedef joint_view left_insert_type; typedef joint_view type; }; diff --git a/include/boost/fusion/algorithm/transformation/push_back.hpp b/include/boost/fusion/algorithm/transformation/push_back.hpp index c33b5da8..98f63702 100644 --- a/include/boost/fusion/algorithm/transformation/push_back.hpp +++ b/include/boost/fusion/algorithm/transformation/push_back.hpp @@ -18,7 +18,7 @@ namespace boost { namespace fusion template struct push_back { - typedef single_view::type> single_view; + typedef fusion::single_view::type> single_view; typedef joint_view type; }; } diff --git a/include/boost/fusion/algorithm/transformation/push_front.hpp b/include/boost/fusion/algorithm/transformation/push_front.hpp index b8ea8261..526e28f1 100644 --- a/include/boost/fusion/algorithm/transformation/push_front.hpp +++ b/include/boost/fusion/algorithm/transformation/push_front.hpp @@ -18,7 +18,7 @@ namespace boost { namespace fusion template struct push_front { - typedef single_view::type> single_view; + typedef fusion::single_view::type> single_view; typedef joint_view type; }; } diff --git a/include/boost/fusion/sequence/view/ext_/segmented_iterator.hpp b/include/boost/fusion/sequence/view/ext_/segmented_iterator.hpp index acde578c..2f6c1f74 100755 --- a/include/boost/fusion/sequence/view/ext_/segmented_iterator.hpp +++ b/include/boost/fusion/sequence/view/ext_/segmented_iterator.hpp @@ -78,16 +78,16 @@ namespace boost { namespace fusion explicit segmented_range(Sequence &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_) - , where(where_) + , where_(wh) {} sequence_type sequence; - iterator_type where; + iterator_type where_; }; } @@ -139,7 +139,7 @@ namespace boost { namespace fusion typedef typename Sequence::iterator_type type; static type call(Sequence &seq) { - return seq.where; + return seq.where_; } }; }; @@ -175,7 +175,7 @@ namespace boost { namespace fusion static type call(segmented_range const &rng) { - return type(rng.sequence, fusion::next(rng.where)); + return type(rng.sequence, fusion::next(rng.where_)); } };