aboutsummaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authorjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2008-11-29 12:21:10 +0000
committerjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2008-11-29 12:21:10 +0000
commitcd740bd533bcdee4e7472f98f54ac86fa4cad6ee (patch)
tree58c63589d15c64b4eb84432c527da1fbb4d5d36e /libcpp
parent3e7184e0e355c1d96cd4b3134e7a8f6ccd303fb0 (diff)
libcpp:
* lex.c (cpp_token_len): Use 6 as default length. gcc/testsuite: * g++.dg/cpp/stringop-1.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142275 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/ChangeLog4
-rw-r--r--libcpp/lex.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 1d0d28c7b4e..9f6148edc13 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-29 Joseph Myers <joseph@codesourcery.com>
+
+ * lex.c (cpp_token_len): Use 6 as default length.
+
2008-10-31 Manuel López-Ibáñez <manu@gcc.gnu.org>
* expr.c (struct op): Add location.
diff --git a/libcpp/lex.c b/libcpp/lex.c
index 57364f00bb9..96d1a99e283 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -1362,7 +1362,7 @@ cpp_token_len (const cpp_token *token)
switch (TOKEN_SPELL (token))
{
- default: len = 4; break;
+ default: len = 6; break;
case SPELL_LITERAL: len = token->val.str.len; break;
case SPELL_IDENT: len = NODE_LEN (token->val.node) * 10; break;
}