diff options
| author | John McCall <rjmccall@apple.com> | 2010-04-23 18:46:30 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-04-23 18:46:30 +0000 |
| commit | e87beb25918543e89d3526e57d77c89d69ec1312 (patch) | |
| tree | 0251d5bd99cb8a68c6e52d722f14e09363b46de9 /clang/lib/AST/ASTImporter.cpp | |
| parent | 126a58e08421432a138f283ba4d572b7fc05db88 (diff) | |
| download | bcm5719-llvm-e87beb25918543e89d3526e57d77c89d69ec1312.tar.gz bcm5719-llvm-e87beb25918543e89d3526e57d77c89d69ec1312.zip | |
Recommit my change to how C++ does elaborated type lookups, now with
two bugfixes which fix selfhost and (hopefully) the nightly tests.
llvm-svn: 102198
Diffstat (limited to 'clang/lib/AST/ASTImporter.cpp')
| -rw-r--r-- | clang/lib/AST/ASTImporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp index d3268030c91..a97536cc77e 100644 --- a/clang/lib/AST/ASTImporter.cpp +++ b/clang/lib/AST/ASTImporter.cpp @@ -1438,7 +1438,7 @@ Decl *ASTNodeImporter::VisitNamespaceDecl(NamespaceDecl *D) { for (DeclContext::lookup_result Lookup = DC->lookup(Name); Lookup.first != Lookup.second; ++Lookup.first) { - if (!(*Lookup.first)->isInIdentifierNamespace(Decl::IDNS_Ordinary)) + if (!(*Lookup.first)->isInIdentifierNamespace(Decl::IDNS_Namespace)) continue; if (NamespaceDecl *FoundNS = dyn_cast<NamespaceDecl>(*Lookup.first)) { @@ -1451,7 +1451,7 @@ Decl *ASTNodeImporter::VisitNamespaceDecl(NamespaceDecl *D) { } if (!ConflictingDecls.empty()) { - Name = Importer.HandleNameConflict(Name, DC, Decl::IDNS_Ordinary, + Name = Importer.HandleNameConflict(Name, DC, Decl::IDNS_Namespace, ConflictingDecls.data(), ConflictingDecls.size()); } |
