diff options
| author | John McCall <rjmccall@apple.com> | 2009-10-09 21:13:30 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2009-10-09 21:13:30 +0000 |
| commit | f36e02d4aff98bf2e52e342e0038d4172fbb5e64 (patch) | |
| tree | de0e84cc5c69c3749a01794221565dcbe5d22614 /lib/Sema/SemaTemplateInstantiateDecl.cpp | |
| parent | d7e5bdb23c6ba2786cf94788c9af555e2c1276ce (diff) | |
Refactor the LookupResult API to simplify most common operations. Require users to
pass a LookupResult reference to lookup routines. Call out uses which assume a single
result.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@83674 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplateInstantiateDecl.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiateDecl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index b354827e01..503d318c4c 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -657,8 +657,9 @@ TemplateDeclInstantiator::VisitCXXMethodDecl(CXXMethodDecl *D, NamedDecl *PrevDecl = 0; if (!FunctionTemplate || TemplateParams) { - PrevDecl = SemaRef.LookupQualifiedName(Owner, Name, - Sema::LookupOrdinaryName, true); + Sema::LookupResult R; + SemaRef.LookupQualifiedName(R, Owner, Name, Sema::LookupOrdinaryName, true); + PrevDecl = R.getAsSingleDecl(SemaRef.Context); // In C++, the previous declaration we find might be a tag type // (class or enum). In this case, the new declaration will hide the |