diff options
| -rw-r--r-- | clang/include/clang/AST/Decl.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/clang/include/clang/AST/Decl.h b/clang/include/clang/AST/Decl.h index 52e09e66436..c39456d96eb 100644 --- a/clang/include/clang/AST/Decl.h +++ b/clang/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) { |
