From 9ec31661aed2aa42a953210a45c2658c5e86ff1d Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 9 Aug 2018 16:20:25 +1200
Subject: [PATCH] Fix compilation failure with GCC 4.8

---
 xapian-core/queryparser/termgenerator.cc          | 10 +++++-----
 xapian-core/queryparser/termgenerator_internal.cc |  4 ++--
 xapian-core/queryparser/termgenerator_internal.h  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xapian-core/queryparser/termgenerator.cc b/xapian-core/queryparser/termgenerator.cc
index 6a66540f6..aab63e784 100644
--- a/xapian-core/queryparser/termgenerator.cc
+++ b/xapian-core/queryparser/termgenerator.cc
@@ -61,7 +61,7 @@ void
 TermGenerator::set_document(const Xapian::Document & doc)
 {
     internal->doc = doc;
-    internal->termpos = 0;
+    internal->cur_pos = 0;
 }
 
 const Xapian::Document &
@@ -121,19 +121,19 @@ TermGenerator::index_text_without_positions(const Xapian::Utf8Iterator & itor,
 void
 TermGenerator::increase_termpos(Xapian::termpos delta)
 {
-    internal->termpos += delta;
+    internal->cur_pos += delta;
 }
 
 Xapian::termpos
 TermGenerator::get_termpos() const
 {
-    return internal->termpos;
+    return internal->cur_pos;
 }
 
 void
 TermGenerator::set_termpos(Xapian::termpos termpos)
 {
-    internal->termpos = termpos;
+    internal->cur_pos = termpos;
 }
 
 string
@@ -147,7 +147,7 @@ TermGenerator::get_description() const
     s += ", doc=";
     s += internal->doc.get_description();
     s += ", termpos=";
-    s += str(internal->termpos);
+    s += str(internal->cur_pos);
     s += ")";
     return s;
 }
diff --git a/xapian-core/queryparser/termgenerator_internal.cc b/xapian-core/queryparser/termgenerator_internal.cc
index 5747d0dfb..c9ebc1f35 100644
--- a/xapian-core/queryparser/termgenerator_internal.cc
+++ b/xapian-core/queryparser/termgenerator_internal.cc
@@ -255,7 +255,7 @@ TermGenerator::Internal::index_text(Utf8Iterator itor, termcount wdf_inc,
 	    if (strategy == TermGenerator::STEM_SOME ||
 		strategy == TermGenerator::STEM_NONE) {
 		if (positional) {
-		    doc.add_posting(prefix + term, ++termpos, wdf_inc);
+		    doc.add_posting(prefix + term, ++cur_pos, wdf_inc);
 		} else {
 		    doc.add_term(prefix + term, wdf_inc);
 		}
@@ -289,7 +289,7 @@ TermGenerator::Internal::index_text(Utf8Iterator itor, termcount wdf_inc,
 	    stemmed_term += prefix;
 	    stemmed_term += stem;
 	    if (strategy != TermGenerator::STEM_SOME && with_positions) {
-		doc.add_posting(stemmed_term, ++termpos, wdf_inc);
+		doc.add_posting(stemmed_term, ++cur_pos, wdf_inc);
 	    } else {
 		doc.add_term(stemmed_term, wdf_inc);
 	    }
diff --git a/xapian-core/queryparser/termgenerator_internal.h b/xapian-core/queryparser/termgenerator_internal.h
index bb1b2929b..9f6ccec66 100644
--- a/xapian-core/queryparser/termgenerator_internal.h
+++ b/xapian-core/queryparser/termgenerator_internal.h
@@ -39,14 +39,14 @@ class TermGenerator::Internal : public Xapian::Internal::intrusive_base {
     Xapian::Internal::opt_intrusive_ptr<const Stopper> stopper;
     stop_strategy stop_mode;
     Document doc;
-    termpos termpos;
+    termpos cur_pos;
     TermGenerator::flags flags;
     unsigned max_word_length;
     WritableDatabase db;
 
   public:
     Internal() : strategy(STEM_SOME), stopper(NULL), stop_mode(STOP_STEMMED),
-	termpos(0), flags(TermGenerator::flags(0)), max_word_length(64) { }
+	cur_pos(0), flags(TermGenerator::flags(0)), max_word_length(64) { }
     void index_text(Utf8Iterator itor,
 		    termcount weight,
 		    const std::string & prefix,
-- 
2.11.4.GIT