summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorSebastian Redl <sebastian.redl@getdesigned.at>2010-08-31 00:36:40 +0000
committerSebastian Redl <sebastian.redl@getdesigned.at>2010-08-31 00:36:40 +0000
commit35034569c708f0e01fc28e260b340c0b58a277d8 (patch)
tree29b8176d749c7c52e946807116ebf55e2a192284 /clang/lib
parentb5c2baa2d7a2e6a85d61f104822a4e3c4ec9436c (diff)
downloadbcm5719-llvm-35034569c708f0e01fc28e260b340c0b58a277d8.tar.gz
bcm5719-llvm-35034569c708f0e01fc28e260b340c0b58a277d8.zip
Add a forgotten place where the enclosing namespace set matters, plus a big testcase for inline namespace fun.
llvm-svn: 112565
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaTemplate.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index 47356bc248a..e06d38d1797 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -3440,8 +3440,8 @@ static bool CheckTemplateSpecializationScope(Sema &S,
getTemplateSpecializationKind(PrevDecl) == TSK_ImplicitInstantiation)){
// There is no prior declaration of this entity, so this
// specialization must be in the same context as the template
- // itself.
- if (!DC->Equals(SpecializedContext)) {
+ // itself, or in the enclosing namespace set.
+ if (!DC->InEnclosingNamespaceSetOf(SpecializedContext)) {
if (isa<TranslationUnitDecl>(SpecializedContext))
S.Diag(Loc, diag::err_template_spec_decl_out_of_scope_global)
<< EntityKind << Specialized;
OpenPOWER on IntegriCloud