From 201e6861f9e86ea4d865b1241e49daeb9eaef747 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 29 Jul 2016 11:10:58 -0400 Subject: [PATCH] * decl.c (build_enumerator): Tweak diagnostic. From-SVN: r238873 --- gcc/cp/ChangeLog | 2 ++ gcc/cp/decl.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 62c6e53b99a..71aa0847806 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2016-07-29 Jason Merrill + * decl.c (build_enumerator): Tweak diagnostic. + PR c++/72457 * init.c (expand_aggr_init_1): Only handle value-init of bases. * constexpr.c (build_data_member_initialization): Handle multiple diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index c7bad41c99b..d2ba7baadc7 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -13590,7 +13590,7 @@ build_enumerator (tree name, tree value, tree enumtype, tree attributes, if (! INTEGRAL_OR_UNSCOPED_ENUMERATION_TYPE_P (TREE_TYPE (value))) { - error ("enumerator for %qD must have integral or " + error ("enumerator value for %qD must have integral or " "unscoped enumeration type", name); value = NULL_TREE; } -- 2.30.2