r262232 - in /trunk/gcc: cp/ChangeLog cp/parser...

[dmalcolm@gcc.gnu.org]

Author: dmalcolm
Date: Thu Jun 28 20:24:49 2018
New Revision: 262232

URL: https://gcc.gnu.org/viewcvs?rev=262232&root=gcc&view=rev
Log:
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.


Added:
    trunk/gcc/testsuite/g++.dg/conflict-markers-2.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/parser.c