diff options
| author | Jason Merrill <jason@redhat.com> | 2018-05-10 14:40:48 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-05-10 14:40:48 -0400 |
| commit | 1e6da0c98398b96378eb22db915b0df2d5a3aa4a (patch) | |
| tree | cd1d0dc064395faa5e241bdee469a3f1f6b19be9 | |
| parent | 86cf10840b6cfbfe03399d10ca6deabb05eb4e40 (diff) | |
| download | gcc-1e6da0c98398b96378eb22db915b0df2d5a3aa4a.zip gcc-1e6da0c98398b96378eb22db915b0df2d5a3aa4a.tar.gz gcc-1e6da0c98398b96378eb22db915b0df2d5a3aa4a.tar.bz2 | |
* class.c (vbase_has_user_provided_move_assign): Use user_provided_p.
From-SVN: r260123
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/class.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 544806d..d175277 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2018-05-09 Jason Merrill <jason@redhat.com> + * class.c (vbase_has_user_provided_move_assign): Use + user_provided_p. + * lambda.c (lambda_expr_this_capture): Improve logic. * decl.c (make_typename_type): s/parameters/arguments/. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 0427d12..30323f0 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -5017,7 +5017,7 @@ vbase_has_user_provided_move_assign (tree type) for (ovl_iterator iter (get_class_binding_direct (type, assign_op_identifier)); iter; ++iter) - if (!DECL_ARTIFICIAL (*iter) && move_fn_p (*iter)) + if (user_provided_p (*iter) && move_fn_p (*iter)) return true; /* Do any of its bases? */ |