projects / gcc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b8be145) | patch
C++: less verbose error-recovery for version conflict markers
authorDavid Malcolm <dmalcolm@redhat.com>
Thu, 28 Jun 2018 20:24:49 +0000 (20:24 +0000)
committerDavid Malcolm <dmalcolm@gcc.gnu.org>
Thu, 28 Jun 2018 20:24:49 +0000 (20:24 +0000)
commiteacb16dc798d06acfb9741a2496584ab0728257a
tree608e9506c05b1ab10f75647e2a1b246d7aa00777tree
parentb8be1451289da4dfd69673b768bdc0e901a0fcefcommit | diff
C++: less verbose error-recovery for version conflict markers

gcc/cp/ChangeLog:
* parser.c (cp_parser_error_1): After issuing a conflict marker
error, consume tokens until the end of the source line.

gcc/testsuite/ChangeLog:
* g++.dg/conflict-markers-2.C: New test.

From-SVN: r262232
gcc/cp/ChangeLog diff | blob | history
gcc/cp/parser.c diff | blob | history
gcc/testsuite/g++.dg/conflict-markers-2.C [new file with mode: 0644] blob