aboutsummaryrefslogtreecommitdiff
path: root/lib/AST/Decl.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2012-04-23 14:27:47 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2012-04-23 14:27:47 +0000
commit38c47674399daac540083a71703d61f66158cbf0 (patch)
treebb54bfb186066c880c92da6a540c0d236396097b /lib/AST/Decl.cpp
parent546ee6dbcafa8a0dc6342497573fafa560be66f8 (diff)
Inline helper function into only caller.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155352 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/Decl.cpp')
-rw-r--r--lib/AST/Decl.cpp2
1 files changed, 1 insertions, 1 deletions
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<NamedDecl>(D))
- LV = merge(LV, getLVForDecl(ND, OnlyTemplate));
+ LV.merge(getLVForDecl(ND, OnlyTemplate));
}
break;