commit 2dc22b4a4afe6b36a6c50c8699ae73fd59094356
author Anders Carlsson <andersca@mac.com> Fri Aug 28 17:57:07 2009 +0000
committer Anders Carlsson <andersca@mac.com> Fri Aug 28 17:57:07 2009 +0000
tree 980b07903a482071f08cad45d5c4441aee9ebe8a
parent 4ba4f21ef29750a1e37e0834245e24a60545651f

Check for UnresolvedUsingDecl when determining if a declaration is a redeclaration or not.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80383 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 15e8bc3..85b5963 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2899,7 +2899,7 @@
     if (PrevDecl && 
         (!AllowOverloadingOfFunction(PrevDecl, Context) || 
          !IsOverload(NewFD, PrevDecl, MatchedDecl)) &&
-        !isa<UsingDecl>(PrevDecl)) {
+        !isa<UsingDecl>(PrevDecl) && !isa<UnresolvedUsingDecl>(PrevDecl)) {
       Redeclaration = true;
       Decl *OldDecl = PrevDecl;