diff options
| author | Faisal Vali <faisalv@yahoo.com> | 2013-11-01 02:01:01 +0000 |
|---|---|---|
| committer | Faisal Vali <faisalv@yahoo.com> | 2013-11-01 02:01:01 +0000 |
| commit | b9657033ccd50504021b63757b92c1e7f4e69993 (patch) | |
| tree | 1a8496d2a732aa6848ccf8238f2f7be77899b4f3 /clang/lib/Parse/ParseCXXInlineMethods.cpp | |
| parent | 2335879ff185f10449c09445fb6189a578fbac56 (diff) | |
| download | bcm5719-llvm-b9657033ccd50504021b63757b92c1e7f4e69993.tar.gz bcm5719-llvm-b9657033ccd50504021b63757b92c1e7f4e69993.zip | |
Support return type deduction for templates in -fdelayed-template-parsing (microsoft) mode
Please see http://llvm-reviews.chandlerc.com/D2053 for discussion and Richard's stamp.
llvm-svn: 193849
Diffstat (limited to 'clang/lib/Parse/ParseCXXInlineMethods.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseCXXInlineMethods.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseCXXInlineMethods.cpp b/clang/lib/Parse/ParseCXXInlineMethods.cpp index 863a09e89d3..0c8ace59e35 100644 --- a/clang/lib/Parse/ParseCXXInlineMethods.cpp +++ b/clang/lib/Parse/ParseCXXInlineMethods.cpp @@ -109,13 +109,15 @@ NamedDecl *Parser::ParseCXXInlineMethodDef(AccessSpecifier AS, return FnD; } - + // In delayed template parsing mode, if we are within a class template // 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 && - !D.getDeclSpec().isConstexprSpecified() && + !D.getDeclSpec().isConstexprSpecified() && + !(FnD && getFunctionDecl(FnD) && + getFunctionDecl(FnD)->getResultType()->getContainedAutoType()) && ((Actions.CurContext->isDependentContext() || (TemplateInfo.Kind != ParsedTemplateInfo::NonTemplate && TemplateInfo.Kind != ParsedTemplateInfo::ExplicitSpecialization)) && |
