summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-04-27 23:21:17 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-04-27 23:21:17 -0500
commitb5a7ac1003316592cdfc7a37d90c64c4c91d4745 (patch)
treeb00550171810da9538642a6de16b2dce2c0f05dc
parent3db14e660e23a4ec407bb5c4984da14550036352 (diff)
downloadtdevelop-b5a7ac1003316592cdfc7a37d90c64c4c91d4745.tar.gz
tdevelop-b5a7ac1003316592cdfc7a37d90c64c4c91d4745.zip
GCC 4.7 fix.
This partially resolves bug report 958. Thanks to Francois Andriot.
-rw-r--r--languages/cpp/cppcodecompletion.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index 9fe4b073..56e8a644 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -3892,15 +3892,15 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
ArgumentList fArgs = ( *it ) ->argumentList();
if ( fArgs.count() != args.count() )
continue;
- ArgumentList::iterator it = args.begin();
+ ArgumentList::iterator it3 = args.begin();
ArgumentList::iterator it2 = fArgs.begin();
bool hit = true;
- while ( it != args.end() ) {
- if ( ( *it ) ->type() != ( *it2 ) ->type() ) {
+ while ( it3 != args.end() ) {
+ if ( ( *it3 ) ->type() != ( *it2 ) ->type() ) {
hit = false;
break;
}
- ++it;
+ ++it3;
++it2;
}
if ( hit ) {