replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[C++11] Updating getUsingDirectives to use iterator_range instead of a std::pair. 

llvm-svn: 203239
This commit is contained in:
Aaron Ballman 2014-03-07 13:44:44 +00:00
parent 18adbc361a
commit 63ab760ebe
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/include/clang/AST/DeclBase.h
View File

@ -1575,16 +1575,16 @@ public:
/// within this context.
typedef UsingDirectiveDecl * const * udir_iterator;
typedef std::pair<udir_iterator, udir_iterator> udir_iterator_range;
typedef llvm::iterator_range<udir_iterator> udir_range;
udir_iterator_range getUsingDirectives() const;
udir_range getUsingDirectives() const;
udir_iterator using_directives_begin() const {
return getUsingDirectives().first;
return getUsingDirectives().begin();
}
udir_iterator using_directives_end() const {
return getUsingDirectives().second;
return getUsingDirectives().end();
}
// These are all defined in DependentDiagnostic.h.

4
clang/lib/AST/DeclBase.cpp
View File

@ -1528,12 +1528,12 @@ void DeclContext::makeDeclVisibleInContextImpl(NamedDecl *D, bool Internal) {
/// Returns iterator range [First, Last) of UsingDirectiveDecls stored within
/// this context.
DeclContext::udir_iterator_range
DeclContext::udir_range
DeclContext::getUsingDirectives() const {
// FIXME: Use something more efficient than normal lookup for using
// directives. In C++, using directives are looked up more than anything else.
lookup_const_result Result = lookup(UsingDirectiveDecl::getName());
return udir_iterator_range(reinterpret_cast<udir_iterator>(Result.begin()),
return udir_range(reinterpret_cast<udir_iterator>(Result.begin()),
reinterpret_cast<udir_iterator>(Result.end()));
}

13
clang/lib/Sema/SemaLookup.cpp
View File

@ -153,9 +153,7 @@ namespace {
void addUsingDirectives(DeclContext *DC, DeclContext *EffectiveDC) {
SmallVector<DeclContext*,4> queue;
while (true) {
DeclContext::udir_iterator I, End;
for (std::tie(I, End) = DC->getUsingDirectives(); I != End; ++I) {
UsingDirectiveDecl *UD = *I;
for (auto UD : DC->getUsingDirectives()) {
DeclContext *NS = UD->getNominatedNamespace();
if (visited.insert(NS)) {
addUsingDirective(UD, EffectiveDC);
@ -1515,8 +1513,8 @@ static bool LookupQualifiedNameInUsingDirectives(Sema &S, LookupResult &R,
continue;
}
for (std::tie(I, E) = ND->getUsingDirectives(); I != E; ++I) {
NamespaceDecl *Nom = (*I)->getNominatedNamespace();
for (auto I : ND->getUsingDirectives()) {
NamespaceDecl *Nom = I->getNominatedNamespace();
if (Visited.insert(Nom))
Queue.push_back(Nom);
}
@ -3085,9 +3083,8 @@ static void LookupVisibleDecls(DeclContext *Ctx, LookupResult &Result,
// Traverse using directives for qualified name lookup.
if (QualifiedNameLookup) {
ShadowContextRAII Shadow(Visited);
DeclContext::udir_iterator I, E;
for (std::tie(I, E) = Ctx->getUsingDirectives(); I != E; ++I) {
LookupVisibleDecls((*I)->getNominatedNamespace(), Result,
for (auto I : Ctx->getUsingDirectives()) {
LookupVisibleDecls(I->getNominatedNamespace(), Result,
QualifiedNameLookup, InBaseClass, Consumer, Visited);
}
}