commit 01ff6d70944dc2b06ec4c2a6340a7bbe839a26d8
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 1696c802e29dd7c73f68fc6b093b3743c4f8a863
parent 18f4107eb7e66784f70d5914453444bd9bc48bc7

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

llvm-svn: 80383

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 15e8bc3..85b5963 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/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;