Harmonize naming

[lyx.git] / src / Compare.cpp

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 5831f2211114ef6c78e7a313f9e4d3dd1c2958cb..303a430b30b25f2decab9415ef1bf4f112c91766 100644 (file)
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -269,7 +269,7 @@ private:
        SnakeResult retrieveMiddleSnake(int k, int D, Direction direction,
                DocPair & middle_snake);
        
-       /// Find the the furthest reaching D-path (number of horizontal
+       /// Find the furthest reaching D-path (number of horizontal
        /// and vertical steps; differences between the old and new
        /// document) in the k-diagonal (vertical minus horizontal steps).
        void furthestDpathKdiagonal(int D, int k,
@@ -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);
                }
        }