From 615754c7b642d4b4bb6b35f1df061e50a3b6d4b6 Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Fri, 27 Apr 2012 23:21:17 -0500
Subject: GCC 4.7 fix. This partially resolves bug report 958. Thanks to
 Francois Andriot. (cherry picked from commit
 b5a7ac1003316592cdfc7a37d90c64c4c91d4745)

---
 languages/cpp/cppcodecompletion.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index a6107480..68b3f2db 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 ) {
-- 
cgit v1.2.3