From dcbe5f71dfffa4540a367d7f1effb5a717d6c4c3 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 2 Jan 2012 06:00:53 +0000 Subject: [PATCH] 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 --- include/clang/AST/Decl.h | 7 ++----- 1 file 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) { -- 2.40.0