X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_docbook.cpp;h=6ab9c9d9f076bd08641567efa20c0530af32d16c;hb=5940dc53aab9fec6cd02f8be337f0e6c9b2e5fb1;hp=48b2f605e75233d9ca74d57bfaaa593b721c4365;hpb=b596330093d3fa5d80e3ffc185771df77a02393b;p=lyx.git

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 48b2f605e7..6ab9c9d9f0 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;
 
@@ -136,7 +138,6 @@ ParagraphList::const_iterator makeEnvironment(
 
 	Layout const & defaultstyle = buf.params().documentClass().defaultLayout();
 	Layout const & bstyle = par->layout();
-	string item_tag;
 
 	// Opening outter tag
 	sgml::openTag(buf, os, runparams, *pbegin);
@@ -238,7 +239,7 @@ ParagraphList::const_iterator makeEnvironment(
 	if (bstyle.latextype == LATEX_ENVIRONMENT && bstyle.pass_thru)
 		os << "]]>";
 
-	// Closing outter tag
+	// Closing outer tag
 	sgml::closeTag(os, *pbegin);
 
 	return pend;
@@ -328,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;