| commit | 6bed454876996adc93fc234692f37cf87a01289c | |
| author | dmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4> | |
| Thu, 28 Jun 2018 20:24:49 +0000 (28 20:24 +0000) | ||
| committer | dmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4> | |
| Thu, 28 Jun 2018 20:24:49 +0000 (28 20:24 +0000) | ||
| tree | 608e9506c05b1ab10f75647e2a1b246d7aa00777 | treesnapshot (tar.gz zip) |
| parent | ba36b06f1298caa5241bcae7a026c5aa7878b4d6 | commitdiff |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@262232 138bc75d-0d04-0410-961f-82ee72b054a4
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@262232 138bc75d-0d04-0410-961f-82ee72b054a4
| gcc/cp/ChangeLog | diffblobblamehistory | |
| gcc/cp/parser.c | diffblobblamehistory | |
| gcc/testsuite/g++.dg/conflict-markers-2.C | [new file with mode: 0644] | blob |