From 753287c1fd79355d03f6f4263cedffb3b8074e9f Mon Sep 17 00:00:00 2001
From: Mattia Barbon <mbarbon@cpan.org>
Date: Wed, 22 Oct 2003 20:54:50 +0000
Subject: [PATCH] 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
---
utils/HelpGen/src/cjparser.cpp | 6 +++---
utils/HelpGen/src/docripper.h | 2 +-
utils/HelpGen/src/ifcontext.h | 2 +-
utils/HelpGen/src/markup.cpp | 2 +-
utils/HelpGen/src/sourcepainter.cpp | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/utils/HelpGen/src/cjparser.cpp b/utils/HelpGen/src/cjparser.cpp
index 1d87c02449..fbec4d74dc 100644
--- 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 !
- while ( identifier[0] == '*' ||
- identifier[0] == '&'
+ while ( identifier[0u] == '*' ||
+ identifier[0u] == '&'
)
{
- type += identifier[0];
+ type += identifier[0u];
identifier.erase(0,1);
if ( !identifier.length() ) return;
diff --git a/utils/HelpGen/src/docripper.h b/utils/HelpGen/src/docripper.h
index 23ae9ac4f0..bc91dca715 100644
--- 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 80014c88f3..50f2eaded2 100644
--- 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 9c0ad1d105..ca27d0aeef 100644
--- 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;
-}
\ No newline at end of file
+}
diff --git a/utils/HelpGen/src/sourcepainter.cpp b/utils/HelpGen/src/sourcepainter.cpp
index 4876009358..333f4aedbb 100644
--- 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 = "";
- int pos = 0;
+ unsigned pos = 0;
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;
- for( int n = 0; n != len; ++n )
+ for( unsigned n = 0; n != len; ++n )
result += mResultStr[pos+n];
--
2.47.2