diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-04-22 15:31:59 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-04-22 15:31:59 +0000 |
| commit | bbc5cbc4108429c9f39a6972d069f58920d7bd99 (patch) | |
| tree | 87da132d89ca6819b9dee276ef6cd5fa5c737efd /clang/lib/AST/Decl.cpp | |
| parent | 6c6cdec3de64b096dba68923117e1236710e97df (diff) | |
| download | bcm5719-llvm-bbc5cbc4108429c9f39a6972d069f58920d7bd99.tar.gz bcm5719-llvm-bbc5cbc4108429c9f39a6972d069f58920d7bd99.zip | |
An attribute in a explicit template installation should take precedence over
the tempale arguments in deciding the visibility.
This agrees with gcc 4.7.
Found by trying to build chrome with component=shared_library with 155314
reverted.
llvm-svn: 155316
Diffstat (limited to 'clang/lib/AST/Decl.cpp')
| -rw-r--r-- | clang/lib/AST/Decl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp index 41bc4a6e201..870e2527455 100644 --- a/clang/lib/AST/Decl.cpp +++ b/clang/lib/AST/Decl.cpp @@ -407,8 +407,8 @@ static LinkageInfo getLVForNamespaceScopeDecl(const NamedDecl *D, // The arguments at which the template was instantiated. const TemplateArgumentList &TemplateArgs = spec->getTemplateArgs(); - LV.mergeWithMin(getLVForTemplateArgumentList(TemplateArgs, - OnlyTemplate)); + LV.merge(getLVForTemplateArgumentList(TemplateArgs, + OnlyTemplate)); } } |
