diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-05-18 20:36:47 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-05-18 20:36:47 +0000 |
commit | c7e6ff02d5cf03b8e36f95bfb0dfb09f7cec8e4a (patch) | |
tree | eb8968b1486d47eb5264b583c6cef83f86aa8541 /clang/lib/Parse | |
parent | fa3872e7ad06f2959f61eba4f0a5c91be7133091 (diff) | |
download | bcm5719-llvm-c7e6ff02d5cf03b8e36f95bfb0dfb09f7cec8e4a.tar.gz bcm5719-llvm-c7e6ff02d5cf03b8e36f95bfb0dfb09f7cec8e4a.zip |
[modules] Support for merging a parsed class template specialization definition into an imported but hidden definition.
llvm-svn: 237612
Diffstat (limited to 'clang/lib/Parse')
-rw-r--r-- | clang/lib/Parse/ParseDeclCXX.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index bb7ae63764a..07fd4742cd5 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/lib/Parse/ParseDeclCXX.cpp @@ -1640,7 +1640,8 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind, *TemplateId, attrs.getList(), MultiTemplateParamsArg(TemplateParams ? &(*TemplateParams)[0] : nullptr, - TemplateParams ? TemplateParams->size() : 0)); + TemplateParams ? TemplateParams->size() : 0), + &SkipBody); } } else if (TemplateInfo.Kind == ParsedTemplateInfo::ExplicitInstantiation && TUK == Sema::TUK_Declaration) { |