fix some compiler warnings in 3rd party CLucene

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/3rdparty/clucene/src/CLucene/config/gunichartables.cpp b/src/3rdparty/clucene/src/CLucene/config/gunichartables.cpp
index 5463936..377171f 100644 (file)
--- a/src/3rdparty/clucene/src/CLucene/config/gunichartables.cpp
+++ b/src/3rdparty/clucene/src/CLucene/config/gunichartables.cpp
@@ -238,7 +238,7 @@ TCHAR cl_tolower (TCHAR ch)
       if (val >= 0x1000000)
       {
         const gchar *p = special_case_table + val - 0x1000000;
-        int len=0;
+        //int len=0;
                wchar_t ret=0;
                lucene_utf8towc(&ret,p,6);
 #ifdef _UCS2

diff --git a/src/3rdparty/clucene/src/CLucene/config/utf8.cpp b/src/3rdparty/clucene/src/CLucene/config/utf8.cpp
index 14ccf5a..b43bd60 100644 (file)
--- a/src/3rdparty/clucene/src/CLucene/config/utf8.cpp
+++ b/src/3rdparty/clucene/src/CLucene/config/utf8.cpp
@@ -208,7 +208,6 @@ size_t lucene_wcstoutf8(char * result, const wchar_t * str, size_t result_length
 size_t lucene_utf8towcs(wchar_t * result, const char * str, size_t result_length){
   char *sp = (char*)str;
   wchar_t *rp = result;
-  int i = 0;
 
   while (rp < result + result_length && *sp!=0){
     size_t r = lucene_utf8towc(rp,sp,6);

diff --git a/src/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp b/src/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
index 1423cc7..1e27ca0 100644 (file)
--- a/src/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
+++ b/src/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
@@ -35,9 +35,9 @@ void IndexModifier::init(Directory* directory, Analyzer* analyzer, bool create)
        open = false;
 
        useCompoundFile = true;
-       int32_t maxBufferedDocs = IndexWriter::DEFAULT_MAX_BUFFERED_DOCS;
+       this->maxBufferedDocs = IndexWriter::DEFAULT_MAX_BUFFERED_DOCS;
        this->maxFieldLength = IndexWriter::DEFAULT_MAX_FIELD_LENGTH;
-       int32_t mergeFactor = IndexWriter::DEFAULT_MERGE_FACTOR;
+       this->mergeFactor = IndexWriter::DEFAULT_MERGE_FACTOR;
        
        this->directory = _CL_POINTER(directory);
        createIndexReader();

diff --git a/src/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp b/src/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
index 5504cf6..bc2cee9 100644 (file)
--- a/src/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
+++ b/src/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
@@ -543,7 +543,7 @@ void IndexWriter::addIndexes(Directory** dirs)
     // start with zero or 1 seg so optimize the current
     optimize();
 
-    int32_t start = segmentInfos.size();
+    // int32_t start = segmentInfos.size();
 
     //Iterate through the directories
     for (int32_t i = 0; dirs[i] != NULL; ++i) {

diff --git a/src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp b/src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
index 40814da..7adf57a 100644 (file)
--- a/src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
+++ b/src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
@@ -265,7 +265,6 @@ int32_t SegmentMerger::mergeFields()
 
     try {  
         IndexReader* reader = NULL;
-        int32_t maxDoc          = 0;
         //Iterate through all readers
         for (uint32_t i = 0; i < readers.size(); i++) {
             // get the i-th reader

diff --git a/src/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp b/src/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
index 53d909b..d18b3d2 100644 (file)
--- a/src/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
+++ b/src/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
@@ -317,7 +317,6 @@ SegmentTermVector* TermVectorsReader::readTermVector(const TCHAR* field,
     free(buffer);
        terms[numTerms]=NULL; //null terminate terms array
 
-       SegmentTermVector* tv = NULL;
        if (storePositions || storeOffsets){
          return _CLNEW SegmentTermPositionVector(field, terms, termFreqs, positions, offsets);
        }else {

diff --git a/src/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp b/src/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
index 7b95b30..cfee010 100644 (file)
--- a/src/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
+++ b/src/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
@@ -43,7 +43,6 @@ QueryParserBase::~QueryParserBase(){
 
 void QueryParserBase::discardEscapeChar(TCHAR* source) const{
        int len = _tcslen(source);
-       int j = 0;
        for (int i = 0; i < len; i++) {
                if (source[i] == '\\' && source[i+1] != '\0' ) {
                        _tcscpy(source+i,source+i+1);