X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_docbook.cpp;h=6ed409c5dda04c69eafadcf2e0f3131bd2fa4abe;hb=3561caa3a171a5984ee7a10b7ea82f7f4b7226e8;hp=12061ef462c3581e0b832e23be3164088ac9725b;hpb=d3b5260f45d8b65c972f89819113723de96ed5ed;p=lyx.git

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 12061ef462..6ed409c5dd 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -32,6 +32,8 @@
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 
+#include <iostream>
+
 using namespace std;
 using namespace lyx::support;
 
@@ -106,15 +108,15 @@ ParagraphList::const_iterator makeParagraph(
 	for (ParagraphList::const_iterator par = pbegin; par != pend; ++par) {
 		if (par != pbegin)
 			os << '\n';
-		bool const default_or_plain = 
-			(buf.params().documentClass().isDefaultLayout(par->layout()) 
+		bool const default_or_plain =
+			(buf.params().documentClass().isDefaultLayout(par->layout())
 				|| buf.params().documentClass().isPlainLayout(par->layout()));
 		if (default_or_plain && par->emptyTag()) {
-			par->simpleDocBookOnePar(buf, os, runparams, 
+			par->simpleDocBookOnePar(buf, os, runparams,
 					text.outerFont(distance(paragraphs.begin(), par)));
 		} else {
 			sgml::openTag(buf, os, runparams, *par);
-			par->simpleDocBookOnePar(buf, os, runparams, 
+			par->simpleDocBookOnePar(buf, os, runparams,
 					text.outerFont(distance(paragraphs.begin(), par)));
 			sgml::closeTag(os, *par);
 		}
@@ -310,7 +312,7 @@ ParagraphList::const_iterator makeCommand(
 	return pend;
 }
 
-} // end anonym namespace
+} // namespace
 
 
 void docbookParagraphs(Text const & text,
@@ -327,8 +329,8 @@ void docbookParagraphs(Text const & text,
 
 	// if only part of the paragraphs will be outputed
 	if (runparams.par_begin !=  runparams.par_end) {
-		par = next(paragraphs.begin(), runparams.par_begin);
-		pend = next(paragraphs.begin(), runparams.par_end);
+		par = lyx::next(paragraphs.begin(), runparams.par_begin);
+		pend = lyx::next(paragraphs.begin(), runparams.par_end);
 		// runparams will be passed to nested paragraphs, so
 		// we have to reset the range parameters.
 		const_cast<OutputParams&>(runparams).par_begin = 0;