anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to fix an assert coming from "gcc vector-index checks".

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33052 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-01-16 00:22:15 +00:00
parent ff93b826e1
commit ec96bbe429
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Compare.cpp
View File

@ -444,6 +444,13 @@ static bool equal(Inset const * i_o, Inset const * i_n)
static bool equal(DocIterator & o, DocIterator & n) { static bool equal(DocIterator & o, DocIterator & n) {
// Explicitly check for this, so we won't call
// Paragraph::getChar for the last pos.
bool const o_lastpos = o.pos() == o.lastpos();
bool const n_lastpos = n.pos() == n.lastpos();
if (o_lastpos || n_lastpos)
return o_lastpos && n_lastpos;
Paragraph const & old_par = o.text()->getPar(o.pit()); Paragraph const & old_par = o.text()->getPar(o.pit());
Paragraph const & new_par = n.text()->getPar(n.pit()); Paragraph const & new_par = n.text()->getPar(n.pit());