summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/Parser.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2012-08-10 21:15:06 +0000
committerFariborz Jahanian <fjahanian@apple.com>2012-08-10 21:15:06 +0000
commitf64b4722eb9aae5d2a82edf3a09eea54ad29c624 (patch)
treedc631466b7bbb8ebe67b7c830de06e25dda54347 /clang/lib/Parse/Parser.cpp
parentd6ef704fe4b33b3c62ed25ad6ea0877bf266ee82 (diff)
downloadbcm5719-llvm-f64b4722eb9aae5d2a82edf3a09eea54ad29c624.tar.gz
bcm5719-llvm-f64b4722eb9aae5d2a82edf3a09eea54ad29c624.zip
objective-C++: dalyed parsing of ctors with member
initializer list defined inside an objc class implementation. wip llvm-svn: 161699
Diffstat (limited to 'clang/lib/Parse/Parser.cpp')
-rw-r--r--clang/lib/Parse/Parser.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp
index 5f00f87af3f..79b3daf38b0 100644
--- a/clang/lib/Parse/Parser.cpp
+++ b/clang/lib/Parse/Parser.cpp
@@ -1026,8 +1026,9 @@ Decl *Parser::ParseFunctionDefinition(ParsingDeclarator &D,
return DP;
}
else if (CurParsedObjCImpl &&
- (Tok.is(tok::l_brace) || Tok.is(tok::kw_try)) &&
- !TemplateInfo.TemplateParams &&
+ !TemplateInfo.TemplateParams &&
+ (Tok.is(tok::l_brace) || Tok.is(tok::kw_try) ||
+ Tok.is(tok::colon)) &&
Actions.CurContext->isTranslationUnit()) {
MultiTemplateParamsArg TemplateParameterLists(Actions, 0, 0);
ParseScope BodyScope(this, Scope::FnScope|Scope::DeclScope);
OpenPOWER on IntegriCloud