From: "Manuel López-Ibáñez" <lopezibanez@gmail.com>
To: David Malcolm <dmalcolm@redhat.com>,
Gcc Patch List <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH, stage1] Better error recovery for merge-conflict markers
Date: Fri, 20 Mar 2015 18:09:00 -0000 [thread overview]
Message-ID: <CAESRpQCBXj9iJ60cOoQL2av=kpm7QHGcxPVausO9TEywvCRLEA@mail.gmail.com> (raw)
> The patch is implemented within libcpp: any such conflict markers were
> typically injected by tools that work on raw lines of unpreprocessed
> text, so it seemed fitting to do it there.
>
> The error can be suppressed with -fno-detect-conflict-markers for
> the case where you're using the compiler just for the C preprocessor
> and some of the input files legitimately contain such character
> sequences.
Could a new option be avoided (and maintain backwards compatibility)
simply by not detecting this error when only preprocessing?
Cheers,
Manuel.
next reply other threads:[~2015-03-20 18:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-20 18:09 Manuel López-Ibáñez [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-03-20 15:38 David Malcolm
2015-03-20 17:50 ` Joseph Myers
2015-04-17 21:47 ` David Malcolm
2015-05-07 21:56 ` Joseph Myers
2015-04-09 8:29 ` Bert Wesarg
2016-02-08 9:07 ` Bert Wesarg
2016-02-10 17:42 ` David Malcolm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAESRpQCBXj9iJ60cOoQL2av=kpm7QHGcxPVausO9TEywvCRLEA@mail.gmail.com' \
--to=lopezibanez@gmail.com \
--cc=dmalcolm@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).