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-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-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 @@ -34,7 +34,7 @@ namespace boost , typename detail::minimum_category< forward_traversal_tag , typename iterator_traversal<Iterator>::type - >::type + >::type , const Type& > { @@ -88,7 +88,7 @@ namespace boost Iterator base()const{return begin_;} - Iterator end()const{return end_;}; + Iterator end()const{return end_;} TokenizerFunc tokenizer_function()const{return f_;} @@ -101,24 +101,24 @@ namespace boost }; 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); } |