diff options
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 2 | ||||
| -rw-r--r-- | test/SemaTemplate/deduction-crash.cpp | 2 | ||||
| -rw-r--r-- | test/SemaTemplate/explicit-instantiation.cpp | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 119bf0f762..f59302868b 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -1551,7 +1551,7 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, // Error parsing the declarator? if (!DeclaratorInfo.hasName()) { // If so, skip until the semi-colon or a }. - SkipUntil(tok::r_brace, true); + SkipUntil(tok::r_brace, true, true); if (Tok.is(tok::semi)) ConsumeToken(); return; diff --git a/test/SemaTemplate/deduction-crash.cpp b/test/SemaTemplate/deduction-crash.cpp index 1860c7577c..8a15605734 100644 --- a/test/SemaTemplate/deduction-crash.cpp +++ b/test/SemaTemplate/deduction-crash.cpp @@ -4,7 +4,7 @@ // Note that the error count below doesn't matter. We just want to // make sure that the parser doesn't crash. -// CHECK: 16 errors +// CHECK: 14 errors template<a> struct int_; diff --git a/test/SemaTemplate/explicit-instantiation.cpp b/test/SemaTemplate/explicit-instantiation.cpp index ffec3c2b97..63016fd715 100644 --- a/test/SemaTemplate/explicit-instantiation.cpp +++ b/test/SemaTemplate/explicit-instantiation.cpp @@ -88,15 +88,12 @@ template<typename> struct X3 { }; inline template struct X3<int>; // expected-warning{{ignoring 'inline' keyword on explicit template instantiation}} static template struct X3<float>; // expected-warning{{ignoring 'static' keyword on explicit template instantiation}} -namespace PR7622 { // expected-note{{to match this}} +namespace PR7622 { template<typename,typename=int> struct basic_streambuf; - // FIXME: Very poor recovery here. template<typename,typename> struct basic_streambuf{friend bob<>()}; // expected-error{{unknown type name 'bob'}} \ // expected-error{{ expected member name or ';' after declaration specifiers}} - template struct basic_streambuf<int>; // expected-error{{explicit instantiation of 'basic_streambuf' in class scope}} -} // expected-error{{expected ';' after struct}} - -//expected-error{{expected '}'}} + template struct basic_streambuf<int>; +} |