diff options
Diffstat (limited to '3rdParty/Boost/src/boost/token_iterator.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/token_iterator.hpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/3rdParty/Boost/src/boost/token_iterator.hpp b/3rdParty/Boost/src/boost/token_iterator.hpp index 19b1db2..929fad6 100644 --- a/3rdParty/Boost/src/boost/token_iterator.hpp +++ b/3rdParty/Boost/src/boost/token_iterator.hpp @@ -31,13 +31,13 @@ namespace boost : public iterator_facade< token_iterator<TokenizerFunc, Iterator, Type> , Type , typename detail::minimum_category< forward_traversal_tag , typename iterator_traversal<Iterator>::type - >::type + >::type , const Type& > { friend class iterator_core_access; @@ -85,43 +85,43 @@ namespace boost , typename 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()) {} Iterator base()const{return begin_;} - Iterator end()const{return end_;}; + Iterator end()const{return end_;} TokenizerFunc tokenizer_function()const{return f_;} Type current_token()const{return tok_;} bool at_end()const{return !valid_;} }; template < - class TokenizerFunc = char_delimiters_separator<char>, + class TokenizerFunc = char_delimiters_separator<char>, class Iterator = std::string::const_iterator, class Type = std::string > class token_iterator_generator { - private: + private: public: typedef token_iterator<TokenizerFunc,Iterator,Type> type; }; - - + + // Type has to be first because it needs to be explicitly specified // because there is no way the function can deduce it. template<class Type, class Iterator, class TokenizerFunc> - typename token_iterator_generator<TokenizerFunc,Iterator,Type>::type + typename token_iterator_generator<TokenizerFunc,Iterator,Type>::type make_token_iterator(Iterator begin, Iterator end,const TokenizerFunc& fun){ - typedef typename + typedef typename token_iterator_generator<TokenizerFunc,Iterator,Type>::type ret_type; return ret_type(fun,begin,end); } } // namespace boost |