Compilation and warning fixes for GCC 3.2.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/HelpGen/src/cjparser.cpp b/utils/HelpGen/src/cjparser.cpp
index 1d87c0244962d7e23da019dc4294fedfb901ba03..fbec4d74dc4604558c54bda6faa29531a17ea011 100644 (file)
--- a/utils/HelpGen/src/cjparser.cpp
+++ b/utils/HelpGen/src/cjparser.cpp
@@ -904,11 +904,11 @@ static void arrange_indirection_tokens_between( string& type,
 {
     // TBD:: FIXME:: return value of operators !
 
 {
     // TBD:: FIXME:: return value of operators !
 

-    while ( identifier[0] == '*' ||
-            identifier[0] == '&'
+    while ( identifier[0u] == '*' ||
+            identifier[0u] == '&'

           )
     {
           )
     {

-        type += identifier[0];
+        type += identifier[0u];

         identifier.erase(0,1);
 
         if ( !identifier.length() ) return;
         identifier.erase(0,1);
 
         if ( !identifier.length() ) return;

diff --git a/utils/HelpGen/src/docripper.h b/utils/HelpGen/src/docripper.h
index 23ae9ac4f02c5231add04f2553f86d65d182f8ee..bc91dca715fa0e2902de20aed626e283cd6e7792 100644 (file)
--- a/utils/HelpGen/src/docripper.h
+++ b/utils/HelpGen/src/docripper.h
@@ -154,4 +154,4 @@ public:
 };
 
 
 };
 
 

-#endif
\ No newline at end of file
+#endif

diff --git a/utils/HelpGen/src/ifcontext.h b/utils/HelpGen/src/ifcontext.h
index 80014c88f36fb0fc6e49ab1a8e43ce425a67a7cb..50f2eaded29534288eddb7f151ed0587b3c43170 100644 (file)
--- a/utils/HelpGen/src/ifcontext.h
+++ b/utils/HelpGen/src/ifcontext.h
@@ -97,4 +97,4 @@ public:
 };
 
 
 };
 
 

-#endif
\ No newline at end of file
+#endif

diff --git a/utils/HelpGen/src/markup.cpp b/utils/HelpGen/src/markup.cpp
index 9c0ad1d1053685995322e168ddd36b81ff11b702..ca27d0aeef52c48b6678f5b394325ec4fee165c9 100644 (file)
--- a/utils/HelpGen/src/markup.cpp
+++ b/utils/HelpGen/src/markup.cpp
@@ -43,4 +43,4 @@ static TagStructT htmlTags[] =
 MarkupTagsT get_HTML_markup_tags()
 {
        return htmlTags;
 MarkupTagsT get_HTML_markup_tags()
 {
        return htmlTags;

-}
\ No newline at end of file
+}

diff --git a/utils/HelpGen/src/sourcepainter.cpp b/utils/HelpGen/src/sourcepainter.cpp
index 487600935830a3f66b1ca9de7ef770705d8bf70a..333f4aedbb609b76513ede63c7d0b7394f6f8f5c 100644 (file)
--- a/utils/HelpGen/src/sourcepainter.cpp
+++ b/utils/HelpGen/src/sourcepainter.cpp
@@ -639,18 +639,18 @@ void SourcePainter::GetResultString(string& result, MarkupTagsT tags)
        // ASSERT( mCollectResultsOn ); 
        result = "";
 
        // ASSERT( mCollectResultsOn ); 
        result = "";
 

-       int pos = 0;
+       unsigned pos = 0;

 
        for( size_t i = 0; i != mBlocks.size(); ++i )
        {
                int desc = mBlocks[i];
 
 
        for( size_t i = 0; i != mBlocks.size(); ++i )
        {
                int desc = mBlocks[i];
 

-               int len  = desc & 0xFFFF;
+               unsigned len  = desc & 0xFFFF;

                int rank = (desc >> 16) & 0xFFFF;
 
                result += tags[ rank_tags_map[rank] ].start;
 
                int rank = (desc >> 16) & 0xFFFF;
 
                result += tags[ rank_tags_map[rank] ].start;
 

-               for( int n = 0; n != len; ++n )
+               for( unsigned n = 0; n != len; ++n )

                
                        result += mResultStr[pos+n];
 
                
                        result += mResultStr[pos+n];