diff options
| author | Ville Voutilainen <ville.voutilainen@gmail.com> | 2018-03-23 15:17:19 +0200 |
|---|---|---|
| committer | Ville Voutilainen <ville@gcc.gnu.org> | 2018-03-23 15:17:19 +0200 |
| commit | 50531a2a1d82e41a39d0c85421b4e99802d6e349 (patch) | |
| tree | 6622512f1bba9714a8e12f522159b80e3555133c /gcc/cp | |
| parent | b01556f72abfae2c7644a0fb331fedacf7930ff2 (diff) | |
| download | gcc-50531a2a1d82e41a39d0c85421b4e99802d6e349.zip gcc-50531a2a1d82e41a39d0c85421b4e99802d6e349.tar.gz gcc-50531a2a1d82e41a39d0c85421b4e99802d6e349.tar.bz2 | |
Implement P0962
* parser.c (cp_parser_perform_range_for_lookup): Change
the condition for deciding whether to use members.
From-SVN: r258803
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b7e2846..e04eae1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-03-23 Ville Voutilainen <ville.voutilainen@gmail.com> + + Implement P0962 + * parser.c (cp_parser_perform_range_for_lookup): Change + the condition for deciding whether to use members. + 2018-03-23 Marek Polacek <polacek@redhat.com> PR c++/85033 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 602cc99..e946d0b 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -12048,7 +12048,7 @@ cp_parser_perform_range_for_lookup (tree range, tree *begin, tree *end) /*protect=*/2, /*want_type=*/false, tf_warning_or_error); - if (member_begin != NULL_TREE || member_end != NULL_TREE) + if (member_begin != NULL_TREE && member_end != NULL_TREE) { /* Use the member functions. */ if (member_begin != NULL_TREE) |