diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-12-05 04:30:04 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-12-05 04:30:04 +0000 |
| commit | ecd4ae9e89f6e216cf6bf9fe08ad04901ecca631 (patch) | |
| tree | 4651fa9726451c2ef3c54a250073f3fb1fa24833 /lib/Sema/SemaTemplate.cpp | |
| parent | 97f18688f35fc57e6edeebde05b28b8ac963e651 (diff) | |
Per [dcl.meaning]p1, a name in an inline namespace can be redeclared using a
name from the enclosing namespace set if the name is specified as a
qualified-id.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@196464 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplate.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplate.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index b5b2f0dbed..0376d106ea 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -968,7 +968,8 @@ Sema::CheckClassTemplate(Scope *S, unsigned TagSpec, TagUseKind TUK, PrevDecl = (*Previous.begin())->getUnderlyingDecl(); } } - } else if (PrevDecl && !isDeclInScope(PrevDecl, SemanticContext, S)) + } else if (PrevDecl && + !isDeclInScope(PrevDecl, SemanticContext, S, SS.isValid())) PrevDecl = PrevClassTemplate = 0; if (PrevClassTemplate) { |