From 78b549399413c64de40f99ab0d3a8f2b6b22adfb Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Thu, 10 Sep 2009 23:18:36 +0000 Subject: Look for overloaded arrow operators in base classes. llvm-svn: 81475 --- clang/lib/Sema/SemaOverload.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'clang/lib') diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index 7e179793d70..4891527e7b2 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -4878,9 +4878,11 @@ Sema::BuildOverloadedArrowExpr(Scope *S, ExprArg BaseIn, SourceLocation OpLoc) { OverloadCandidateSet CandidateSet; const RecordType *BaseRecord = Base->getType()->getAs(); - DeclContext::lookup_const_iterator Oper, OperEnd; - for (llvm::tie(Oper, OperEnd) - = BaseRecord->getDecl()->lookup(OpName); Oper != OperEnd; ++Oper) + LookupResult R = LookupQualifiedName(BaseRecord->getDecl(), OpName, + LookupOrdinaryName); + + for (LookupResult::iterator Oper = R.begin(), OperEnd = R.end(); + Oper != OperEnd; ++Oper) AddMethodCandidate(cast(*Oper), Base, 0, 0, CandidateSet, /*SuppressUserConversions=*/false); @@ -4903,14 +4905,14 @@ Sema::BuildOverloadedArrowExpr(Scope *S, ExprArg BaseIn, SourceLocation OpLoc) { case OR_Ambiguous: Diag(OpLoc, diag::err_ovl_ambiguous_oper) - << "operator->" << Base->getSourceRange(); + << "->" << Base->getSourceRange(); PrintOverloadCandidates(CandidateSet, /*OnlyViable=*/true); return ExprError(); case OR_Deleted: Diag(OpLoc, diag::err_ovl_deleted_oper) << Best->Function->isDeleted() - << "operator->" << Base->getSourceRange(); + << "->" << Base->getSourceRange(); PrintOverloadCandidates(CandidateSet, /*OnlyViable=*/true); return ExprError(); } -- cgit v1.2.3