aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaDeclCXX.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2010-11-23 22:03:51 +0000
committerJohn McCall <rjmccall@apple.com>2010-11-23 22:03:51 +0000
commitfe4ea55700c806493bebbf7bbfe07ce4b7339a3e (patch)
tree5befa5f4e99a34da478f463a683d4d1730d7963f /lib/Sema/SemaDeclCXX.cpp
parentb2b93c12d768cfdeb21909f734b04ccb82d75da2 (diff)
Redeclarations of using declarations are not okay in function scopes.
Not sure what I was thinking before. Fixes PR8668. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@120063 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDeclCXX.cpp')
-rw-r--r--lib/Sema/SemaDeclCXX.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 235b41e342..ad8b8695cc 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -3961,8 +3961,8 @@ bool Sema::CheckUsingDeclRedeclaration(SourceLocation UsingLoc,
// repeatedly where (and only where) multiple declarations are
// allowed.
//
- // That's in non-member contexts.
- if (!CurContext->getRedeclContext()->isRecord())
+ // That's in file contexts.
+ if (CurContext->isFileContext())
return false;
NestedNameSpecifier *Qual