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_functions.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_functions.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/token_functions.hpp | 47 |
1 files changed, 16 insertions, 31 deletions
diff --git a/3rdParty/Boost/src/boost/token_functions.hpp b/3rdParty/Boost/src/boost/token_functions.hpp index 4d1a1df..33b37cd 100644 --- a/3rdParty/Boost/src/boost/token_functions.hpp +++ b/3rdParty/Boost/src/boost/token_functions.hpp @@ -1,6 +1,6 @@ // Boost token_functions.hpp ------------------------------------------------// -// Copyright John R. Bandela 2001. +// Copyright John R. Bandela 2001. // Distributed under the Boost Software License, Version 1.0. (See // accompanying file LICENSE_1_0.txt or copy at @@ -77,12 +77,12 @@ namespace std{ namespace boost{ //=========================================================================== // The escaped_list_separator class. Which is a model of TokenizerFunction - // An escaped list is a super-set of what is commonly known as a comma - // separated value (csv) list.It is separated into fields by a comma or + // An escaped list is a super-set of what is commonly known as a comma + // separated value (csv) list.It is separated into fields by a comma or // other character. If the delimiting character is inside quotes, then it is // counted as a regular character.To allow for embedded quotes in a field, - // there can be escape sequences using the \ much like C. - // The role of the comma, the quotation mark, and the escape + // there can be escape sequences using the \ much like C. + // The role of the comma, the quotation mark, and the escape // character (backslash \), can be assigned to other characters. struct escaped_list_error : public std::runtime_error{ @@ -181,7 +181,7 @@ namespace boost{ ++next; // The last character was a c, that means there is // 1 more blank field - last_ = true; + last_ = true; return true; } else tok+=*next; @@ -209,7 +209,7 @@ namespace boost{ // Assuming that the conditional will always get optimized out in the function // implementations, argument types are not a problem since both forms of character classifiers // expect an int. - + #if !defined(BOOST_NO_CWCTYPE) template<typename traits, int N> struct traits_extension_details : public traits { @@ -238,7 +238,7 @@ namespace boost{ }; #endif - + // In case there is no cwctype header, we implement the checks manually. // We make use of the fact that the tested categories should fit in ASCII. template<typename traits> @@ -278,22 +278,7 @@ namespace boost{ struct assign_or_plus_equal { template<class Iterator, class Token> static void assign(Iterator b, Iterator e, Token &t) { - -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) &&\ - BOOST_WORKAROUND(__SGI_STL_PORT, < 0x500) &&\ - defined(_STLP_DEBUG) &&\ - (defined(_STLP_USE_DYNAMIC_LIB) || defined(_DLL)) - // Problem with string::assign for msvc-stlport in debug mode: the - // linker tries to import the templatized version of this memfun, - // which is obviously not exported. - // See http://www.stlport.com/dcforum/DCForumID6/1763.html for details. - - t = Token(); - while(b != e) t += *b++; -#else t.assign(b, e); -#endif - } template<class Token, class Value> @@ -309,8 +294,8 @@ namespace boost{ template <> struct assign_or_plus_equal<std::input_iterator_tag> { template<class Iterator, class Token> - static void assign(Iterator b, Iterator e, Token &t) { } - template<class Token, class Value> + static void assign(Iterator , Iterator , Token &) { } + template<class Token, class Value> static void plus_equal(Token &t, const Value &v) { t += v; } @@ -444,7 +429,7 @@ namespace boost{ typedef tokenizer_detail::traits_extension<Tr> Traits; typedef std::basic_string<Char,Tr> string_type; public: - explicit + explicit char_separator(const Char* dropped_delims, const Char* kept_delims = 0, empty_token_policy empty_tokens = drop_empty_tokens) @@ -511,7 +496,7 @@ namespace boost{ m_output_done = true; assigner::assign(start,next,tok); return true; - } + } else return false; } @@ -524,10 +509,10 @@ namespace boost{ ++next; m_output_done = false; } - } + } else if (m_output_done == false && is_dropped(*next)) { m_output_done = true; - } + } else { if (is_dropped(*next)) start=++next; @@ -618,7 +603,7 @@ namespace boost{ } public: - explicit char_delimiters_separator(bool return_delims = false, + explicit char_delimiters_separator(bool return_delims = false, const Char* returnable = 0, const Char* nonreturnable = 0) : returnable_(returnable ? returnable : string_type().c_str()), @@ -636,7 +621,7 @@ namespace boost{ // skip past all nonreturnable delims // skip past the returnable only if we are not returning delims - for (;next!=end && ( is_nonret(*next) || (is_ret(*next) + for (;next!=end && ( is_nonret(*next) || (is_ret(*next) && !return_delims_ ) );++next) { } if (next == end) { |