commit 38c47674399daac540083a71703d61f66158cbf0
author Rafael Espindola <rafael.espindola@gmail.com> Mon Apr 23 14:27:47 2012 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Mon Apr 23 14:27:47 2012 +0000
tree bb54bfb186066c880c92da6a540c0d236396097b
parent 546ee6dbcafa8a0dc6342497573fafa560be66f8

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

diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index 55464d4..e9fbfb2 100644
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -304,11 +304,6 @@
       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.

lib/AST/Decl.cpp

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 870e252..77cc7a2 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -130,7 +130,7 @@
       // arguments, valid only in C++0x.
       if (Decl *D = Args[I].getAsDecl()) {
         if (NamedDecl *ND = dyn_cast<NamedDecl>(D))
-          LV = merge(LV, getLVForDecl(ND, OnlyTemplate));
+          LV.merge(getLVForDecl(ND, OnlyTemplate));
       }
       break;