diff options
| author | Sean Hunt <scshunt@csclub.uwaterloo.ca> | 2012-06-19 23:57:03 +0000 |
|---|---|---|
| committer | Sean Hunt <scshunt@csclub.uwaterloo.ca> | 2012-06-19 23:57:03 +0000 |
| commit | 8e083e71d48f7f4d6ef40c00531c2e14df745486 (patch) | |
| tree | 5ffbac1a9faf271bf15b49461210abedaeda2926 /lib/Parse/ParseDeclCXX.cpp | |
| parent | 5ca8639f97663255880f0da81f1026a06a14d003 (diff) | |
Reapply r158700 and fixup patches, minus one hunk that slipped through and
caused a crash in an obscure case. On the plus side, it caused me to catch
another bug by inspection.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158767 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index b9062927c6..6e391c9022 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -2902,11 +2902,11 @@ void Parser::ParseCXX11AttributeSpecifier(ParsedAttributes &attrs, switch (AttributeList::getKind(AttrName, ScopeName, AttributeList::AS_CXX11)) { // No arguments - case AttributeList::AT_carries_dependency: + case AttributeList::AT_CarriesDependency: // FIXME: implement generic support of attributes with C++11 syntax // see Parse/ParseDecl.cpp: ParseGNUAttributes - case AttributeList::AT_fallthrough: - case AttributeList::AT_noreturn: { + case AttributeList::AT_FallThrough: + case AttributeList::AT_NoReturn: { if (Tok.is(tok::l_paren)) { Diag(Tok.getLocation(), diag::err_cxx11_attribute_forbids_arguments) << AttrName->getName(); |