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 | 72bcaeca1d3e5b1947f760cabf7b9fa096d99b73 (patch) | |
| tree | a966de4dca3e49e39d5821919d44148fdfa04d87 /clang/lib/Sema/SemaTemplate.cpp | |
| parent | e99bb4b2b9041271695f77672aa8cc2c3ce1ba5c (diff) | |
| download | bcm5719-llvm-72bcaeca1d3e5b1947f760cabf7b9fa096d99b73.tar.gz bcm5719-llvm-72bcaeca1d3e5b1947f760cabf7b9fa096d99b73.zip | |
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.
llvm-svn: 196464
Diffstat (limited to 'clang/lib/Sema/SemaTemplate.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaTemplate.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index b5b2f0dbedc..0376d106eae 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/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) { |
