Suppressed many integer size warnings by a mix of type adjustments and casts,

none of which should have a real effect.

--HG--
branch : WINDOWSPORT

src/rcldb/rcldb.cpp

@@ -433,7 +433,7 @@ bool Db::Native::dbDataToRclDoc(Xapian::docid docid, std::string &data,
     string dbdir = m_rcldb->m_basedir;
     doc.idxi = 0;
     if (!m_rcldb->m_extraDbs.empty()) {
-	unsigned int idxi = whatDbIdx(docid);
+	int idxi = int(whatDbIdx(docid));
 
 	// idxi is in [0, extraDbs.size()]. 0 is for the main index,
 	// idxi-1 indexes into the additional dbs array.
@@ -555,7 +555,7 @@ int Db::Native::getPageNumberForPosition(const vector<int>& pbreaks, int pos)
 	return -1;
     vector<int>::const_iterator it = 
 	upper_bound(pbreaks.begin(), pbreaks.end(), pos);
-    return it - pbreaks.begin() + 1;
+    return int(it - pbreaks.begin() + 1);
 }
 
 // Note: we're passed a Xapian::Document* because Xapian

src/rcldb/searchdata.cpp

@@ -242,7 +242,7 @@ void SearchData::simplify()
              j < i + clsubp->getSub()->m_query.size(); j++) {
             m_query[j]->setParent(this);
         }
-        i += clsubp->getSub()->m_query.size() - 1;
+        i += int(clsubp->getSub()->m_query.size()) - 1;
 
         // We don't want the clauses to be deleted when the parent is, as we
         // know own them.

src/rcldb/searchdata.h

@@ -376,7 +376,7 @@ protected:
     std::string  m_field; // Field specification if any
     HighlightData m_hldata;
     // Current count of Xapian clauses, to check against expansion limit
-    int  m_curcl;
+    size_t  m_curcl;
     bool processUserString(Rcl::Db &db, const string &iq,
 			   std::string &ermsg,
 			   void* pq, int slack = 0, bool useNear = false);

src/rcldb/searchdatatox.cpp

@@ -840,7 +840,7 @@ bool SearchDataClauseSimple::processUserString(Rcl::Db &db, const string &iq,
 	    tpq.setTSQ(&splitter);
 	    splitter.text_to_words(*it);
 
-	    slack += tpq.lastpos() - tpq.terms().size() + 1;
+	    slack += tpq.lastpos() - int(tpq.terms().size()) + 1;
 
 	    LOGDEB0(("strToXapianQ: termcount: %d\n", tpq.terms().size()));
 	    switch (tpq.terms().size() + terminc) {