maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use the unused merge() function, fixing an minor, unintended change I 

introduced in r121023.

llvm-svn: 121025
This commit is contained in:
Douglas Gregor 2010-12-06 18:50:56 +00:00
parent 67f13b19b5
commit 91df6cf85e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/AST/Decl.cpp
View File

@ -102,7 +102,7 @@ struct LVFlags {
F.ConsiderVisibilityAttributes = false;
return F;
}
};
};
} // end anonymous namespace
/// \brief Get the most restrictive linkage for the types in the given
@ -153,18 +153,14 @@ static LVPair getLVForTemplateArgumentList(const TemplateArgument *Args,
// The decl can validly be null as the representation of nullptr
// arguments, valid only in C++0x.
if (Decl *D = Args[I].getAsDecl()) {
if (NamedDecl *ND = dyn_cast<NamedDecl>(D)) {
LinkageInfo LI = getLVForDecl(ND, F);
LV = merge(LV, LVPair(LI.linkage(), LI.visibility()));
}
if (NamedDecl *ND = dyn_cast<NamedDecl>(D))
LV = merge(LV, getLVForDecl(ND, F));
}
break;
case TemplateArgument::Template:
if (TemplateDecl *Template = Args[I].getAsTemplate().getAsTemplateDecl()){
LinkageInfo LI = getLVForDecl(Template, F);
LV = merge(LV, LVPair(LI.linkage(), LI.visibility()));
}
if (TemplateDecl *Template = Args[I].getAsTemplate().getAsTemplateDecl())
LV = merge(LV, getLVForDecl(Template, F));
break;
case TemplateArgument::Pack: