X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=b2f64390f062b37a889431c2a7c23278cf0e5e2b;hb=c1ee1bc0baf00a64734ec5eb345884c057e4d9c1;hp=2344f2526daf3c545874ace9f34af510b516c096;hpb=1900eb28343eb004275df21f2157a3727dce6fcf;p=lyx.git

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 2344f2526d..b2f64390f0 100644
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -19,6 +19,7 @@
 
 #include "insets/InsetText.h"
 
+#include "support/docstream.h"
 #include "support/lassert.h"
 #include "support/lyxalgo.h"
 #include "support/qstring_helpers.h"
@@ -61,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();
 	}
 
@@ -422,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(next(ps_.begin(), startpit),
-		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