From 39fd529935dffec9f48cdf560b8e83ba1313eee4 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Wed, 30 Mar 2016 20:41:05 +0000 Subject: [PATCH] [Sema] s/UseUsingDeclRules/UseMemberUsingDeclRules/ Summary: IsOverload has a param named UseUsingDeclRules. But as far as I can tell, it should be called UseMemberUsingDeclRules. That is, it only applies to "using" declarations inside classes or structs. Reviewers: rsmith Subscribers: cfe-commits Differential Revision: http://reviews.llvm.org/D18538 llvm-svn: 264920 --- clang/lib/Sema/SemaOverload.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index c7ee0c7..11f6286 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -992,7 +992,7 @@ Sema::CheckOverload(Scope *S, FunctionDecl *New, const LookupResult &Old, } bool Sema::IsOverload(FunctionDecl *New, FunctionDecl *Old, - bool UseUsingDeclRules) { + bool UseMemberUsingDeclRules) { // C++ [basic.start.main]p2: This function shall not be overloaded. if (New->isMain()) return false; @@ -1048,7 +1048,7 @@ bool Sema::IsOverload(FunctionDecl *New, FunctionDecl *Old, // // However, we don't consider either of these when deciding whether // a member introduced by a shadow declaration is hidden. - if (!UseUsingDeclRules && NewTemplate && + if (!UseMemberUsingDeclRules && NewTemplate && (!TemplateParameterListsAreEqual(NewTemplate->getTemplateParameters(), OldTemplate->getTemplateParameters(), false, TPL_TemplateMatch) || @@ -1068,7 +1068,7 @@ bool Sema::IsOverload(FunctionDecl *New, FunctionDecl *Old, if (OldMethod && NewMethod && !OldMethod->isStatic() && !NewMethod->isStatic()) { if (OldMethod->getRefQualifier() != NewMethod->getRefQualifier()) { - if (!UseUsingDeclRules && + if (!UseMemberUsingDeclRules && (OldMethod->getRefQualifier() == RQ_None || NewMethod->getRefQualifier() == RQ_None)) { // C++0x [over.load]p2: -- 2.7.4