diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticGroups.td | 1 | ||||
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticParseKinds.td | 4 | ||||
| -rw-r--r-- | clang/test/SemaCXX/overloaded-operator.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index 9b4c939a953..8572c62e4bb 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -38,7 +38,6 @@ def : DiagGroup<"disabled-optimization">; def : DiagGroup<"discard-qual">; def : DiagGroup<"div-by-zero">; def EmptyBody : DiagGroup<"empty-body">; -def EnumeratorListComma : DiagGroup<"enumerator-list-comma">; def ExtraTokens : DiagGroup<"extra-tokens">; def FormatExtraArgs : DiagGroup<"format-extra-args">; diff --git a/clang/include/clang/Basic/DiagnosticParseKinds.td b/clang/include/clang/Basic/DiagnosticParseKinds.td index 734b414b519..63bd3f65a91 100644 --- a/clang/include/clang/Basic/DiagnosticParseKinds.td +++ b/clang/include/clang/Basic/DiagnosticParseKinds.td @@ -51,9 +51,9 @@ def ext_c99_variable_decl_in_for_loop : Extension< "variable declaration in for loop is a C99-specific feature">; def ext_c99_compound_literal : Extension< "compound literals are a C99-specific feature">; -def ext_enumerator_list_comma : ExtWarn< +def ext_enumerator_list_comma : Extension< "commas at the end of enumerator lists are a %select{C99|C++0x}0-specific " - "feature">, InGroup<EnumeratorListComma>; + "feature">; def ext_gnu_indirect_goto : Extension< "use of GNU indirect-goto extension">, InGroup<GNU>; diff --git a/clang/test/SemaCXX/overloaded-operator.cpp b/clang/test/SemaCXX/overloaded-operator.cpp index 15d6605d025..24f7f66129e 100644 --- a/clang/test/SemaCXX/overloaded-operator.cpp +++ b/clang/test/SemaCXX/overloaded-operator.cpp @@ -293,7 +293,7 @@ void circ() { // PR5360: Arrays should lead to built-in candidates for subscript. typedef enum { - LastReg = 23, // expected-warning{{commas at the end of enumerator lists are a C++0x-specific feature}} + LastReg = 23, } Register; class RegAlloc { int getPriority(Register r) { |
