diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-06-28 21:43:01 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-06-28 21:43:01 +0000 |
| commit | 1edf57639afb8cb9f306ea92b86ee39f3cd96dbe (patch) | |
| tree | 4b80ba6d9311845c1a63d1c83920e0ac12590722 /clang/lib/Parse/ParseCXXInlineMethods.cpp | |
| parent | d9c8aace7bb9bbc1d1914037944723f3ec70c1de (diff) | |
| download | bcm5719-llvm-1edf57639afb8cb9f306ea92b86ee39f3cd96dbe.tar.gz bcm5719-llvm-1edf57639afb8cb9f306ea92b86ee39f3cd96dbe.zip | |
Support the use of "=delete" and "=default" with delayed template
parsing. Fixes <rdar://problem/11700604>.
llvm-svn: 159380
Diffstat (limited to 'clang/lib/Parse/ParseCXXInlineMethods.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseCXXInlineMethods.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Parse/ParseCXXInlineMethods.cpp b/clang/lib/Parse/ParseCXXInlineMethods.cpp index 131c6b65461..abce27c3f82 100644 --- a/clang/lib/Parse/ParseCXXInlineMethods.cpp +++ b/clang/lib/Parse/ParseCXXInlineMethods.cpp @@ -109,6 +109,7 @@ Decl *Parser::ParseCXXInlineMethodDef(AccessSpecifier AS, // or if we are about to parse function member template then consume // the tokens and store them for parsing at the end of the translation unit. if (getLangOpts().DelayedTemplateParsing && + DefinitionKind == FDK_Definition && ((Actions.CurContext->isDependentContext() || TemplateInfo.Kind != ParsedTemplateInfo::NonTemplate) && !Actions.IsInsideALocalClassWithinATemplateFunction())) { |
