diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-01-02 06:00:53 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-01-02 06:00:53 +0000 |
| commit | dcbe5f71dfffa4540a367d7f1effb5a717d6c4c3 (patch) | |
| tree | ae81431f1be772cb238e2adc44dcbbbb9206eb0f | |
| parent | a28cb3ee88946deeb8e58d41c1e75de2d93e9cbd (diff) | |
Small refactoring so that only one of the mergeVisibility/mergeLinkage functions
calls setVisibility/setLinkage.
No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@147423 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/AST/Decl.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h index 52e09e6643..c39456d96e 100644 --- a/include/clang/AST/Decl.h +++ b/include/clang/AST/Decl.h @@ -252,13 +252,10 @@ public: setLinkage(minLinkage(linkage(), L)); } void mergeLinkage(LinkageInfo Other) { - setLinkage(minLinkage(linkage(), Other.linkage())); + mergeLinkage(Other.linkage()); } - void mergeVisibility(Visibility V) { - setVisibility(minVisibility(visibility(), V)); - } - void mergeVisibility(Visibility V, bool E) { + void mergeVisibility(Visibility V, bool E = false) { setVisibility(minVisibility(visibility(), V), visibilityExplicit() || E); } void mergeVisibility(LinkageInfo Other) { |