diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2018-06-28 20:24:49 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2018-06-28 20:24:49 +0000 |
| commit | eacb16dc798d06acfb9741a2496584ab0728257a (patch) | |
| tree | 608e9506c05b1ab10f75647e2a1b246d7aa00777 /libgo/runtime/go-caller.c | |
| parent | b8be1451289da4dfd69673b768bdc0e901a0fcef (diff) | |
| download | gcc-eacb16dc798d06acfb9741a2496584ab0728257a.zip gcc-eacb16dc798d06acfb9741a2496584ab0728257a.tar.gz gcc-eacb16dc798d06acfb9741a2496584ab0728257a.tar.bz2 | |
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
Diffstat (limited to 'libgo/runtime/go-caller.c')
0 files changed, 0 insertions, 0 deletions