From 38c47674399daac540083a71703d61f66158cbf0 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 23 Apr 2012 14:27:47 +0000 Subject: [PATCH] Inline helper function into only caller. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155352 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/Decl.h | 5 ----- lib/AST/Decl.cpp | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h index 55464d4044..e9fbfb297e 100644 --- a/include/clang/AST/Decl.h +++ b/include/clang/AST/Decl.h @@ -304,11 +304,6 @@ public: mergeLinkage(Other); mergeVisibilityWithMin(Other); } - - friend LinkageInfo merge(LinkageInfo L, LinkageInfo R) { - L.merge(R); - return L; - } }; /// \brief Determine what kind of linkage this entity has. diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index 870e252745..77cc7a29b4 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -130,7 +130,7 @@ static LinkageInfo getLVForTemplateArgumentList(const TemplateArgument *Args, // arguments, valid only in C++0x. if (Decl *D = Args[I].getAsDecl()) { if (NamedDecl *ND = dyn_cast(D)) - LV = merge(LV, getLVForDecl(ND, OnlyTemplate)); + LV.merge(getLVForDecl(ND, OnlyTemplate)); } break; -- 2.40.0