diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-09-11 17:54:14 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-09-11 17:54:14 +0000 |
| commit | af494faa57daee0ae115de27f97cbfe9d712c276 (patch) | |
| tree | dcbd74a9a51dc796492d111bbb309d556136fd5d | |
| parent | 10e9bffde3c89d1da873f8ec4832c2301b2282cf (diff) | |
| download | bcm5719-llvm-af494faa57daee0ae115de27f97cbfe9d712c276.tar.gz bcm5719-llvm-af494faa57daee0ae115de27f97cbfe9d712c276.zip | |
Just ignore friend templates for now so we won't crash.
llvm-svn: 81536
| -rw-r--r-- | clang/lib/Parse/ParseDeclCXX.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index 8fa8525750b..bb268e70c00 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/lib/Parse/ParseDeclCXX.cpp @@ -1014,10 +1014,13 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, if (Tok.is(tok::semi)) { ConsumeToken(); - // FIXME: Friend templates? - if (DS.isFriendSpecified()) + if (DS.isFriendSpecified()) { + // FIXME: Friend templates are ignored for now. + if (TemplateInfo.Kind != ParsedTemplateInfo::NonTemplate) + return; + Actions.ActOnFriendDecl(CurScope, &DS, /*IsDefinition*/ false); - else + } else Actions.ParsedFreeStandingDeclSpec(CurScope, DS); return; |
