Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/token_iterator.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
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 @@ -2,127 +2,127 @@ // Copyright John R. Bandela 2001 // Distributed under the Boost Software License, Version 1.0. (See // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/tokenizer for documentation. // Revision History: // 16 Jul 2003 John Bandela // Allowed conversions from convertible base iterators // 03 Jul 2003 John Bandela // Converted to new iterator adapter #ifndef BOOST_TOKENIZER_POLICY_JRB070303_HPP_ #define BOOST_TOKENIZER_POLICY_JRB070303_HPP_ #include<boost/assert.hpp> #include<boost/iterator/iterator_adaptor.hpp> #include<boost/iterator/detail/minimum_category.hpp> #include<boost/token_functions.hpp> #include<utility> namespace boost { template <class TokenizerFunc, class Iterator, class Type> class token_iterator : 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; TokenizerFunc f_; Iterator begin_; Iterator end_; bool valid_; Type tok_; void increment(){ BOOST_ASSERT(valid_); valid_ = f_(begin_,end_,tok_); } const Type& dereference() const { BOOST_ASSERT(valid_); return tok_; } template<class Other> bool equal(const Other& a) const{ return (a.valid_ && valid_) ?( (a.begin_==begin_) && (a.end_ == end_) ) :(a.valid_==valid_); } void initialize(){ if(valid_) return; f_.reset(); valid_ = (begin_ != end_)? f_(begin_,end_,tok_):false; } public: token_iterator():begin_(),end_(),valid_(false),tok_() { } token_iterator(TokenizerFunc f, Iterator begin, Iterator e = Iterator()) : f_(f),begin_(begin),end_(e),valid_(false),tok_(){ initialize(); } token_iterator(Iterator begin, Iterator e = Iterator()) : f_(),begin_(begin),end_(e),valid_(false),tok_() {initialize();} template<class OtherIter> token_iterator( token_iterator<TokenizerFunc, OtherIter,Type> const& t , 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 #endif |