diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-01-29 10:02:16 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-01-29 10:02:16 +0000 |
| commit | d03de6aaa312d57dcd6e2bc76bed1e89f5c5019d (patch) | |
| tree | 6eb0b96b1c0883d75befbcd1d33e372f78493b93 /lib/Parse | |
| parent | 93384a910cb98f3a128b76e6043f149e1b384c65 (diff) | |
Downgrade 'attribute ignored when parsing type' from error to warning, to match
the diagnostic's warn_ name. Switch some places (notably C++11 attributes)
which really wanted an error over to a different diagnostic. Finally, suppress
the diagnostic entirely for __ptr32, __ptr64 and __w64, to avoid producing
diagnostics in important system headers.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173788 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse')
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 2 | ||||
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index 20d8f711ae..e11fb913a7 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -1151,7 +1151,7 @@ void Parser::ProhibitCXX11Attributes(ParsedAttributesWithRange &attrs) { AttributeList *AttrList = attrs.getList(); while (AttrList) { if (AttrList->isCXX11Attribute()) { - Diag(AttrList->getLoc(), diag::warn_attribute_no_decl) + Diag(AttrList->getLoc(), diag::err_attribute_not_type_attr) << AttrList->getName(); AttrList->setInvalid(); } diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 4f0c893b04..5af3ea741a 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -439,8 +439,8 @@ Decl *Parser::ParseUsingDirective(unsigned Context, /// unqualified-id /// 'using' :: unqualified-id /// -/// alias-declaration: C++0x [decl.typedef]p2 -/// 'using' identifier = type-id ; +/// alias-declaration: C++11 [dcl.dcl]p1 +/// 'using' identifier attribute-specifier-seq[opt] = type-id ; /// Decl *Parser::ParseUsingDeclaration(unsigned Context, const ParsedTemplateInfo &TemplateInfo, @@ -564,7 +564,7 @@ Decl *Parser::ParseUsingDeclaration(unsigned Context, tok::semi); // Diagnose an attempt to declare a templated using-declaration. - // In C++0x, alias-declarations can be templates: + // In C++11, alias-declarations can be templates: // template <...> using id = type; if (TemplateInfo.Kind && !IsAliasDecl) { SourceRange R = TemplateInfo.getSourceRange(); |