diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e73246a4a66..5214d9a91ac 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2014-02-03 Marc Glisse <marc.glisse@inria.fr> + + PR c++/53017 + PR c++/59211 + * tree.c (handle_init_priority_attribute): Call default_conversion on + the attribute argument. + 2014-02-03 Paolo Carlini <paolo.carlini@oracle.com> PR c++/58871 diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index fe2ddabae1d..5567253a61a 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -3250,6 +3250,7 @@ handle_init_priority_attribute (tree* node, int pri; STRIP_NOPS (initp_expr); + initp_expr = default_conversion (initp_expr); if (!initp_expr || TREE_CODE (initp_expr) != INTEGER_CST) { |