X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=303a430b30b25f2decab9415ef1bf4f112c91766;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=427688024c5a06f8ac1d6f2f25fed34614f736fd;hpb=d750b6610f9104d9a32e6e71d86cc309d913830f;p=lyx.git diff --git a/src/Compare.cpp b/src/Compare.cpp index 427688024c..303a430b30 100644 --- a/src/Compare.cpp +++ b/src/Compare.cpp @@ -602,7 +602,7 @@ Compare::Impl::SnakeResult Compare::Impl::retrieveMiddleSnake( if (os[k].empty() && os_r[kk].empty()) { // No, there is no snake at all, in which case // the length of the shortest edit script is M+N. - LASSERT(2 * D - odd_offset_ == M_ + N_, /**/); + LATTEST(2 * D - odd_offset_ == M_ + N_); return NoSnake; } @@ -822,7 +822,7 @@ void Compare::Impl::processSnake(DocRangePair const & rp) pit_type const pit = it.o.pit() - rp.o.from.pit(); pos_type const pos = pit ? it.o.pos() : it.o.pos() - rp.o.from.pos(); inset = pars[pit].getInset(pos); - LASSERT(inset, /**/); + LASSERT(inset, continue); diffInset(inset, it); } }