summaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authoremsr <emsr@138bc75d-0d04-0410-961f-82ee72b054a4>2014-06-05 11:12:08 +0000
committeremsr <emsr@138bc75d-0d04-0410-961f-82ee72b054a4>2014-06-05 11:12:08 +0000
commit1608bb4b5b8017decd67a0fe6a32b20f443aa68c (patch)
tree365af881dd463797da80d577e40800caaae1bc62 /libcpp
parentc3440169767f1ec192a119584723c1c6349505cc (diff)
downloadgcc-1608bb4b5b8017decd67a0fe6a32b20f443aa68c.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211266 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/macro.c7
1 files 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. */