X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Ftoken_functions.hpp;h=867525fb1a0e67cc777753b2c3630104ec7ac729;hb=7677e9487c1669735a2aa9b2356199c2f608fe15;hp=c329e3bc39716dc2d7392a509cb38182b023cb40;hpb=d64a07a784241498594fc9d2bc0b7eae598134e4;p=lyx.git diff --git a/boost/boost/token_functions.hpp b/boost/boost/token_functions.hpp index c329e3bc39..867525fb1a 100644 --- a/boost/boost/token_functions.hpp +++ b/boost/boost/token_functions.hpp @@ -6,7 +6,7 @@ // 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. +// See http://www.boost.org/libs/tokenizer/ for documentation. // Revision History: // 01 Oct 2004 Joaquín M López Muñoz @@ -74,7 +74,7 @@ namespace boost{ // character (backslash \), can be assigned to other characters. struct escaped_list_error : public std::runtime_error{ - escaped_list_error(const std::string& what):std::runtime_error(what) { } + escaped_list_error(const std::string& what_arg):std::runtime_error(what_arg) { } }; @@ -335,12 +335,13 @@ namespace boost{ if (next == end) return false; - if (current_offset_ == offsets_.size()) + if (current_offset_ == offsets_.size()) { if (wrap_offsets_) current_offset_=0; else return false; - + } + int c = offsets_[current_offset_]; int i = 0; for (; i < c; ++i) { @@ -448,14 +449,15 @@ namespace boost{ else { // m_empty_tokens == keep_empty_tokens // Handle empty token at the end - if (next == end) + if (next == end) { if (m_output_done == false) { m_output_done = true; assigner::assign(start,next,tok); return true; } else return false; - + } + if (is_kept(*next)) { if (m_output_done == false) m_output_done = true;