warnings

diff --git a/base/ReStringList.cpp b/base/ReStringList.cpp
index 2f7ed6e3a07a7449815c448d047b0b52ac76a859..7c28aa09adae7ab221e9565ac755321e3435e758 100644 (file)
--- a/base/ReStringList.cpp
+++ b/base/ReStringList.cpp
@@ -362,7 +362,7 @@ int ReStringList::firstDiff(const ReStringList& toCompare) const{
        int count1 = count();
        int count2 = toCompare.count();
        int maxIx = count1 > count2 ? count2 : count1;
-       for (size_t ix = 0; rc == -1 && ix < maxIx; ix++){
+       for (size_t ix = 0; rc == -1 && (int) ix < maxIx; ix++){
                if (sizeOf(ix) != toCompare.sizeOf(ix)
                                || strcmp(strOf(ix), toCompare.strOf(ix)) != 0)
                        rc = (int) ix;

diff --git a/base/ReTestUnit.cpp b/base/ReTestUnit.cpp
index 5076c6d9f978982c0fb05d0ca69dd818eb276ffd..0c4180ddb5f91373f36a90926c493cdfa73199d8 100644 (file)
--- a/base/ReTestUnit.cpp
+++ b/base/ReTestUnit.cpp
@@ -155,8 +155,8 @@ void ReTestUnit::assertEqualFiles(const char* name1, const char* name2, int line
                int ixLine = line1.firstDifference(list2.strOf(ix), list2.strLengthOf(ix));
                logF(true, i18n("%s-%d: Files differ in line %d-%d\n%s\n%s\n%s"),
                        m_sourceFile.str(), lineNo, ix, ixLine,
-                       list1.count() > ix ? list1.strOf(ix) : "",
-                       list2.count() > ix ? list2.strOf(ix) : "",
+                       (int) list1.count() > ix ? list1.strOf(ix) : "",
+                       (int) list2.count() > ix ? list2.strOf(ix) : "",
                        colMarker(ixLine));
        }
 

diff --git a/os/ReDirTools.cpp b/os/ReDirTools.cpp
index 6ac14d495a1977335c4ebe22f2ad45827cabf151..f364a311d58bb9544959487062a002261dd69363 100644 (file)
--- a/os/ReDirTools.cpp
+++ b/os/ReDirTools.cpp
@@ -133,10 +133,15 @@ void ReDirOptions::initCompoundUsage(size_t size){
  */
 void ReDirOptions::addCompoundUsage(const char** usage){
     int start = 0;
-    while(m_compoundUsage[start] != NULL)
-        assert(++start < m_countCompoundUsage);
+    while(m_compoundUsage[start] != NULL){
+        if (++start >= m_countCompoundUsage)
+            assert(false);
+    }
     for (int ix = 0; usage[ix] != NULL; ix++){
-        assert(start + ix < m_countCompoundUsage);
+        if (start + ix > m_countCompoundUsage){
+            assert(false);
+            break;
+        }
         m_compoundUsage[start + ix] = usage[ix];
     }
 }