[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
This commit is contained in:
parent
e3804cc932
commit
39fd529935
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue