Address some comments on the name lookup/DeclContext patch from Chris

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60897 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 7 insertions, 6 deletions

diff --git a/lib/Sema/SemaCXXScopeSpec.cpp b/lib/Sema/SemaCXXScopeSpec.cpp
index d01552c373..193e259f1d 100644
--- a/lib/Sema/SemaCXXScopeSpec.cpp
+++ b/lib/Sema/SemaCXXScopeSpec.cpp
@@ -15,21 +15,22 @@
 #include "clang/AST/ASTContext.h"

 #include "clang/Parse/DeclSpec.h"

 #include "clang/Basic/Diagnostic.h"

+#include "llvm/ADT/STLExtras.h"

 using namespace clang;

 

 

 namespace {

   Decl *LookupNestedName(DeclContext *LookupCtx, bool LookInParentCtx,

                          DeclarationName Name, bool &IdIsUndeclared,

-                        ASTContext &Context) {

+                         ASTContext &Context) {

     if (LookupCtx && !LookInParentCtx) {

       IdIsUndeclared = true;

-      for (DeclContext::lookup_const_result I = LookupCtx->lookup(Context, Name);

-          I.first != I.second; ++I.first) {

+      DeclContext::lookup_const_iterator I, E;

+      for (llvm::tie(I, E) = LookupCtx->lookup(Context, Name); I != E; ++I) {

        IdIsUndeclared = false;

-       if (((*I.first)->getIdentifierNamespace() & Decl::IDNS_Tag) &&

-           !isa<EnumDecl>(*I.first))

-         return *I.first;

+       if (((*I)->getIdentifierNamespace() & Decl::IDNS_Tag) && 

+           !isa<EnumDecl>(*I))

+         return *I;

       }

 

       return 0;