diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-16 21:57:05 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-16 21:57:05 +0000 |
| commit | 5293379374f46f670305a75dd3df667f04292dc9 (patch) | |
| tree | 464aa9dda0c64b5626ee236c0d50a3cd2e03f1e5 /clang/test/Modules/submodules-merge-defs.cpp | |
| parent | 6e07e9305b1043350d576faf0b75ad6c3c547c19 (diff) | |
| download | bcm5719-llvm-5293379374f46f670305a75dd3df667f04292dc9.tar.gz bcm5719-llvm-5293379374f46f670305a75dd3df667f04292dc9.zip | |
[modules] Fix merging of default template arguments onto friend templates.
Previously we'd complain about redefinition of default arguments when we
instantiated a class with a friend template that inherits its default argument,
because we propagate the default template arguemnt onto the friend when we
reload the AST.
llvm-svn: 239857
Diffstat (limited to 'clang/test/Modules/submodules-merge-defs.cpp')
| -rw-r--r-- | clang/test/Modules/submodules-merge-defs.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/test/Modules/submodules-merge-defs.cpp b/clang/test/Modules/submodules-merge-defs.cpp index cbe2dcdf562..0dd8680b5ff 100644 --- a/clang/test/Modules/submodules-merge-defs.cpp +++ b/clang/test/Modules/submodules-merge-defs.cpp @@ -74,3 +74,4 @@ int post_fg = F<char>().g<int>(); J<> post_j; template<typename T, int N, template<typename> class K> struct J; J<> post_j2; +FriendDefArg::Y<int> friend_def_arg; |
