===================================================================
@@ -17270,12 +17270,16 @@
tag_type = enum_type;
/* Issue a warning if the `struct' or `class' key (for C++0x scoped
enums) is used here. */
- if (cp_lexer_next_token_is_keyword (parser->lexer, RID_CLASS)
- || cp_lexer_next_token_is_keyword (parser->lexer, RID_STRUCT))
+ cp_token *token = cp_lexer_peek_token (parser->lexer);
+ if (cp_parser_is_keyword (token, RID_CLASS)
+ || cp_parser_is_keyword (token, RID_STRUCT))
{
- pedwarn (input_location, 0, "elaborated-type-specifier "
- "for a scoped enum must not use the %qD keyword",
- cp_lexer_peek_token (parser->lexer)->u.value);
+ gcc_rich_location richloc (token->location);
+ richloc.add_range (input_location, false);
+ richloc.add_fixit_remove ();
+ pedwarn_at_rich_loc (&richloc, 0, "elaborated-type-specifier for "
+ "a scoped enum must not use the %qD keyword",
+ token->u.value);
/* Consume the `struct' or `class' and parse it anyway. */
cp_lexer_consume_token (parser->lexer);
}
===================================================================
2017-04-25 Volker Reichelt <v.reichelt@netcologne.de>
* g++.dg/cpp0x/enum34.C: New test.
===================================================================
@@ -0,0 +1,11 @@
+// { dg-options "-fdiagnostics-show-caret" }
+// { dg-do compile { target c++11 } }
+
+enum class E;
+
+enum class E e; /* { dg-warning "scoped enum must not use" }
+ { dg-begin-multiline-output "" }
+ enum class E e;
+ ~~~~ ^~~~~
+ -----
+ { dg-end-multiline-output "" } */