Fix C++ issues like missing typename and shadowing of a local variable

with another.

3 files changed, 40 insertions, 1 deletions

diff --git a/devel/kdevelop-base/distinfo b/devel/kdevelop-base/distinfo
index f09698987a0..5504c9a1bf5 100644
--- a/devel/kdevelop-base/distinfo
+++ b/devel/kdevelop-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2011/11/25 21:45:02 joerg Exp $
+$NetBSD: distinfo,v 1.41 2012/06/25 11:21:34 joerg Exp $
 
 SHA1 (kdevelop_3.5.5.orig.tar.gz) = a28c7e4e9b5a7244a5a7063593c9713178a54bcd
 RMD160 (kdevelop_3.5.5.orig.tar.gz) = 5426fdff33ce32908141c098c8dfd5e4223c928a
@@ -10,6 +10,8 @@ SHA1 (patch-ah) = fec4ba7d20ca75c2a4dc5942270cab899776a741
 SHA1 (patch-ai) = 79386e66fd512b9c963de6e3e0214e88fc367946
 SHA1 (patch-aj) = 49a8fa7b2061961f9a8a5993e2b8b06403798c08
 SHA1 (patch-languages_bash_bashsupport__part.cpp) = 4214ca2c8152a19d6920173a68b03e0734d5bdd9
+SHA1 (patch-languages_cpp_cppcodecompletion.cpp) = c2f4415d29c881b651cc3ac8c90f3470c813e4cf
+SHA1 (patch-languages_cpp_simpletypecachebinder.h) = fe1e1feca5a95c1f46a614f22ff303dd6a66d1f1
 SHA1 (patch-languages_csharp_csharpsupportpart.cpp) = 64e530dbf53ffa40ee5b80d5ff5b12fd941c456b
 SHA1 (patch-languages_perl_perlparser.cpp) = 7269721f036ec82032390eda51fe3afaae9c3853
 SHA1 (patch-languages_perl_perlsupportpart.cpp) = 87128f0a2714368e41400dfa341a060d2b647d56
diff --git a/devel/kdevelop-base/patches/patch-languages_cpp_cppcodecompletion.cpp b/devel/kdevelop-base/patches/patch-languages_cpp_cppcodecompletion.cpp
new file mode 100644
index 00000000000..2e51b29cc99
--- /dev/null
+++ b/devel/kdevelop-base/patches/patch-languages_cpp_cppcodecompletion.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-languages_cpp_cppcodecompletion.cpp,v 1.1 2012/06/25 11:21:35 joerg Exp $
+
+--- languages/cpp/cppcodecompletion.cpp.orig	2012-06-18 23:10:55.000000000 +0000
++++ languages/cpp/cppcodecompletion.cpp
+@@ -3892,15 +3892,15 @@ void CppCodeCompletion::computeCompletio
+         ArgumentList fArgs = ( *it ) ->argumentList();
+         if ( fArgs.count() != args.count() )
+           continue;
+-        ArgumentList::iterator it = args.begin();
++        ArgumentList::iterator ait = args.begin();
+         ArgumentList::iterator it2 = fArgs.begin();
+         bool hit = true;
+-        while ( it != args.end() ) {
+-          if ( ( *it ) ->type() != ( *it2 ) ->type() ) {
++        while ( ait != args.end() ) {
++          if ( ( *ait ) ->type() != ( *it2 ) ->type() ) {
+             hit = false;
+             break;
+           }
+-          ++it;
++          ++ait;
+           ++it2;
+         }
+         if ( hit ) {
diff --git a/devel/kdevelop-base/patches/patch-languages_cpp_simpletypecachebinder.h b/devel/kdevelop-base/patches/patch-languages_cpp_simpletypecachebinder.h
new file mode 100644
index 00000000000..5ec385af1aa
--- /dev/null
+++ b/devel/kdevelop-base/patches/patch-languages_cpp_simpletypecachebinder.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-languages_cpp_simpletypecachebinder.h,v 1.1 2012/06/25 11:21:35 joerg Exp $
+
+--- languages/cpp/simpletypecachebinder.h.orig	2012-06-18 23:20:34.000000000 +0000
++++ languages/cpp/simpletypecachebinder.h
+@@ -37,7 +37,7 @@ class SimpleTypeCacheBinder : public Bas
+   template <class InitType1, class InitType2>
+   SimpleTypeCacheBinder( InitType1 t, InitType2 t2 ) : Base ( t, t2 ), m_haveBasesCache( false ), secondaryActive( true ), primaryActive( true ) {}
+ 
+-  using Base::LocateMode;
++  using typename Base::LocateMode;
+ 
+   struct LocateDesc {
+    TypeDesc mname;