Inline helper function into only caller.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155352 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index 55464d4044ecebf9cae5d54ff86b40b980e01026..e9fbfb297e6263e15f76ff164e9832d82ab06186 100644 (file)
--- 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 870e25274551f7d06ccdbefd9a46107c00499495..77cc7a29b4d4dafad557d002ab8173e23deb1747 100644 (file)
--- 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<NamedDecl>(D))
-          LV = merge(LV, getLVForDecl(ND, OnlyTemplate));
+          LV.merge(getLVForDecl(ND, OnlyTemplate));
       }
       break;