diff options
| author | Edward Smith-Rowland <emsr@gcc.gnu.org> | 2014-06-05 11:12:08 +0000 |
|---|---|---|
| committer | Edward Smith-Rowland <emsr@gcc.gnu.org> | 2014-06-05 11:12:08 +0000 |
| commit | 1251f7f1ee87a78b8ce761aa3e331d347c5ad6c5 (patch) | |
| tree | 365af881dd463797da80d577e40800caaae1bc62 /libcpp/macro.c | |
| parent | aaaa9efcb4baa0dc0146879297d281fd1830e9f5 (diff) | |
| download | gcc-1251f7f1ee87a78b8ce761aa3e331d347c5ad6c5.zip gcc-1251f7f1ee87a78b8ce761aa3e331d347c5ad6c5.tar.gz gcc-1251f7f1ee87a78b8ce761aa3e331d347c5ad6c5.tar.bz2 | |
re PR c++/61038 (g++ -E is unusable with UDL strings)
PR c++/61038
I was asked to combine the escape logic for regular chars and strings
with the escape logic for user-defined literals chars and strings.
I just forgot the first time.
From-SVN: r211266
Diffstat (limited to 'libcpp/macro.c')
| -rw-r--r-- | libcpp/macro.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libcpp/macro.c b/libcpp/macro.c index c3db9a2..407eb8c 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -492,10 +492,9 @@ stringify_arg (cpp_reader *pfile, macro_arg *arg) || token->type == CPP_WSTRING || token->type == CPP_WCHAR || token->type == CPP_STRING32 || token->type == CPP_CHAR32 || token->type == CPP_STRING16 || token->type == CPP_CHAR16 - || token->type == CPP_UTF8STRING); - - escape_it = escape_it || cpp_userdef_string_p (token->type) - || cpp_userdef_char_p (token->type); + || token->type == CPP_UTF8STRING + || cpp_userdef_string_p (token->type) + || cpp_userdef_char_p (token->type)); /* Room for each char being written in octal, initial space and final quote and NUL. */ |