]> granicus.if.org Git - clang/commit
[modules] Fix merging of default template arguments onto friend templates.
authorRichard Smith <richard-llvm@metafoo.co.uk>
Tue, 16 Jun 2015 21:57:05 +0000 (21:57 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Tue, 16 Jun 2015 21:57:05 +0000 (21:57 +0000)
commit2aef2bd4b10105ca4661993d42de2db5ac306c8d
tree1c9c5d924a1ddc2280d8beb1ce5d40a6e2711f93
parent68c71b1ebc4565100d4b7ff9ed04addf34fc3d03
[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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@239857 91177308-0d34-0410-b5e6-96231b3b80d8
lib/Sema/SemaTemplateInstantiateDecl.cpp
test/Modules/Inputs/submodules-merge-defs/defs.h
test/Modules/submodules-merge-defs.cpp