From 1251f7f1ee87a78b8ce761aa3e331d347c5ad6c5 Mon Sep 17 00:00:00 2001 From: Edward Smith-Rowland Date: Thu, 5 Jun 2014 11:12:08 +0000 Subject: [PATCH] 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 --- libcpp/macro.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libcpp/macro.c b/libcpp/macro.c index c3db9a277a3..407eb8c7767 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. */