X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=b2f64390f062b37a889431c2a7c23278cf0e5e2b;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=72510e908ba039fb20a4cc52c0393e1bfb0e85a1;hpb=a5a01b6af33c7a7ad1d798098efa7b4df7c3bde5;p=lyx.git

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 72510e908b..b2f64390f0 100644
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -19,11 +19,11 @@
 
 #include "insets/InsetText.h"
 
+#include "support/docstream.h"
 #include "support/lassert.h"
+#include "support/lyxalgo.h"
 #include "support/qstring_helpers.h"
 
-#include <boost/next_prior.hpp>
-
 using namespace std;
 using namespace lyx::support;
 
@@ -62,10 +62,10 @@ public:
 		: from(from_), to(to_)
 	{}
 
-	DocRange(Buffer const * buf)
+	DocRange(Buffer const * buf) :
+		from(doc_iterator_begin(buf)),
+		to(doc_iterator_end(buf))
 	{
-		from = doc_iterator_begin(buf);
-		to = doc_iterator_end(buf);
 		to.backwardPos();
 	}
 
@@ -229,7 +229,7 @@ class Compare::Impl {
 public:
 	///
 	Impl(Compare const & compare)
-		: abort_(false), N_(0), M_(0), offset_reverse_diagonal_(0),
+		: abort_(false), n_(0), m_(0), offset_reverse_diagonal_(0),
 		  odd_offset_(0), compare_(compare),
 		  old_buf_(0), new_buf_(0), dest_buf_(0), dest_pars_(0),
 		  recursion_level_(0), nested_inset_level_(0), D_(0)
@@ -307,9 +307,9 @@ private:
 	void writeToDestBuffer(ParagraphList const & copy_pars) const;
 
 	/// The length of the old chunk currently processed
-	int N_;
+	int n_;
 	/// The length of the new chunk currently processed
-	int M_;
+	int m_;
 	/// The offset diagonal of the reverse path of the
 	/// currently processed chunk
 	int offset_reverse_diagonal_;
@@ -423,8 +423,8 @@ static void getParagraphList(DocRange const & range,
 	pit_type startpit = range.from.pit();
 	pit_type endpit = range.to.pit();
 	ParagraphList const & ps_ = range.text()->paragraphs();
-	ParagraphList tmp_pars(boost::next(ps_.begin(), startpit),
-		boost::next(ps_.begin(), endpit + 1));
+	ParagraphList tmp_pars(lyx::next(ps_.begin(), startpit),
+		lyx::next(ps_.begin(), endpit + 1));
 
 	// Remove the end of the last paragraph; afterwards, remove the
 	// beginning of the first paragraph. Keep this order - there may only
@@ -613,7 +613,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.
-		LATTEST(2 * D - odd_offset_ == M_ + N_);
+		LATTEST(2 * D - odd_offset_ == m_ + n_);
 		return NoSnake;
 	}
 
@@ -635,12 +635,12 @@ int Compare::Impl::findMiddleSnake(DocRangePair const & rp,
 	DocPair & middle_snake)
 {
 	// The lengths of the old and new chunks.
-	N_ = rp.o.length();
-	M_ = rp.n.length();
+	n_ = rp.o.length();
+	m_ = rp.n.length();
 
 	// Forward paths are centered around the 0-diagonal; reverse paths
 	// are centered around the diagonal N - M. (Delta in the article)
-	offset_reverse_diagonal_ = N_ - M_;
+	offset_reverse_diagonal_ = n_ - m_;
 
 	// If the offset is odd, only check for overlap while extending forward
     // paths, otherwise only check while extending reverse paths.
@@ -656,7 +656,7 @@ int Compare::Impl::findMiddleSnake(DocRangePair const & rp,
 	nrs.reset(DocIterator());
 
 	// In the formula below, the "+ 1" ensures we round like ceil()
-	int const D_max = (M_ + N_ + 1)/2;
+	int const D_max = (m_ + n_ + 1)/2;
 	// D is the number of horizontal and vertical steps, i.e.
 	// different characters in the old and new chunk.
 	for (int D = 0; D <= D_max; ++D) {