anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-14 01:22:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport revision 20309:

Browse Source 
URL: http://www.lyx.org/trac/changeset/20309

* Ambigous else
* Missing header file

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@20310 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2007-09-16 12:14:03 +00:00
parent ab225a0dfa
commit 84f9bac291
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boost/boost/regex/v4/cpp_regex_traits.hpp
View File

@ -41,6 +41,7 @@
#include <istream> #include <istream>
#include <ios> #include <ios>
#include <climits>
#ifdef BOOST_HAS_ABI_HEADERS #ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_PREFIX # include BOOST_ABI_PREFIX

10
boost/boost/token_functions.hpp
View File

@ -335,12 +335,13 @@ namespace boost{
if (next == end) if (next == end)
return false; return false;
if (current_offset_ == offsets_.size()) if (current_offset_ == offsets_.size()) {
if (wrap_offsets_) if (wrap_offsets_)
current_offset_=0; current_offset_=0;
else else
return false; return false;
}
int c = offsets_[current_offset_]; int c = offsets_[current_offset_];
int i = 0; int i = 0;
for (; i < c; ++i) { for (; i < c; ++i) {
@ -448,14 +449,15 @@ namespace boost{
else { // m_empty_tokens == keep_empty_tokens else { // m_empty_tokens == keep_empty_tokens
// Handle empty token at the end // Handle empty token at the end
if (next == end) if (next == end) {
if (m_output_done == false) { if (m_output_done == false) {
m_output_done = true; m_output_done = true;
assigner::assign(start,next,tok); assigner::assign(start,next,tok);
return true; return true;
} else } else
return false; return false;
}
if (is_kept(*next)) { if (is_kept(*next)) {
if (m_output_done == false) if (m_output_done == false)
m_output_done = true; m_output_done = true;