Skip to content

Add missing includes, switch to min_category, add iterators namespace #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lastique wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add missing includes, switch to min_category, add iterators namespace #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions include/boost/token_iterator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,33 @@

#include <boost/assert.hpp>
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/minimum_category.hpp>
#include <boost/iterator/iterator_categories.hpp>
#include <boost/iterator/enable_if_convertible.hpp>
#include <boost/iterator/min_category.hpp>
#include <boost/token_functions.hpp>
#include <utility>
#include <string>

namespace boost
{
template <class TokenizerFunc, class Iterator, class Type>
class token_iterator
: public iterator_facade<
: public iterators::iterator_facade<
token_iterator<TokenizerFunc, Iterator, Type>
, Type
, typename iterators::minimum_category<
, typename iterators::min_category<
forward_traversal_tag
, typename iterator_traversal<Iterator>::type
, typename iterators::iterator_traversal<Iterator>::type
>::type
, const Type&
>
{

#ifdef __DCC__
friend class boost::iterator_core_access;
#else
#ifdef __DCC__
friend class boost::iterators::iterator_core_access;
#else
friend class iterator_core_access;
#endif
#endif
TokenizerFunc f_;
Iterator begin_;
Iterator end_;
Expand Down Expand Up @@ -85,7 +88,7 @@ namespace boost
template<class OtherIter>
token_iterator(
token_iterator<TokenizerFunc, OtherIter,Type> const& t
, typename enable_if_convertible<OtherIter, Iterator>::type* = 0)
, typename iterators::enable_if_convertible<OtherIter, Iterator>::type* = 0)
: f_(t.tokenizer_function()),begin_(t.base())
,end_(t.end()),valid_(!t.at_end()),tok_(t.current_token()) {}

Expand Down
Loading