diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 4 | ||||
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index cefd325248..75831ccbba 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -2194,13 +2194,13 @@ void Parser::ParseDirectDeclarator(Declarator &D) { SourceLocation NameLoc = Tok.getLocation(); SourceLocation EndLoc; CXXScopeSpec *SS = afterCXXScope? &D.getCXXScopeSpec() : 0; - TypeResult Type = ParseClassName(EndLoc, SS); + TypeResult Type = ParseClassName(EndLoc, SS, true); if (Type.isInvalid()) D.SetIdentifier(0, TildeLoc); else D.setDestructor(Type.get(), TildeLoc, NameLoc); } else { - Diag(Tok, diag::err_expected_class_name); + Diag(Tok, diag::err_destructor_class_name); D.SetIdentifier(0, TildeLoc); } goto PastIdentifier; diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 88e027db02..b9b2979911 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -427,7 +427,8 @@ void Parser::ParseDecltypeSpecifier(DeclSpec &DS) { /// simple-template-id /// Parser::TypeResult Parser::ParseClassName(SourceLocation &EndLocation, - const CXXScopeSpec *SS) { + const CXXScopeSpec *SS, + bool DestrExpected) { // Check whether we have a template-id that names a type. if (Tok.is(tok::annot_template_id)) { TemplateIdAnnotation *TemplateId @@ -457,7 +458,8 @@ Parser::TypeResult Parser::ParseClassName(SourceLocation &EndLocation, TypeTy *Type = Actions.getTypeName(*Tok.getIdentifierInfo(), Tok.getLocation(), CurScope, SS); if (!Type) { - Diag(Tok, diag::err_expected_class_name); + Diag(Tok, DestrExpected ? diag::err_destructor_class_name + : diag::err_expected_class_name); return true; } |