[cfe-commits] r155352 - in /cfe/trunk: include/clang/AST/Decl.h lib/AST/Decl.cpp

[Rafael Espindola]

Author: rafael
Date: Mon Apr 23 09:27:47 2012
New Revision: 155352

URL: http://llvm.org/viewvc/llvm-project?rev=155352&view=rev
Log:
Inline helper function into only caller.

Modified:
    cfe/trunk/include/clang/AST/Decl.h
    cfe/trunk/lib/AST/Decl.cpp

Modified: cfe/trunk/include/clang/AST/Decl.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=155352&r1=155351&r2=155352&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/Decl.h (original)
+++ cfe/trunk/include/clang/AST/Decl.h Mon Apr 23 09:27:47 2012
@@ -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.

Modified: cfe/trunk/lib/AST/Decl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Decl.cpp?rev=155352&r1=155351&r2=155352&view=diff
==============================================================================
--- cfe/trunk/lib/AST/Decl.cpp (original)
+++ cfe/trunk/lib/AST/Decl.cpp Mon Apr 23 09:27:47 2012
@@ -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;