summaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authorEd Smith-Rowland <3dw4rd@verizon.net>2011-11-21 19:27:30 +0000
committerJason Merrill <jason@gcc.gnu.org>2011-11-21 14:27:30 -0500
commit7e74ce3f94ece593b30c97a5f7427c3de601a8c5 (patch)
treec5bf0a4816e7907735b0ce901cff5513fb6278af /libcpp
parentf3fae478f43753041564b94a9b002f399c6576fb (diff)
downloadgcc-7e74ce3f94ece593b30c97a5f7427c3de601a8c5.tar.gz
re PR c++/50958 ([C++0x] raw literal operator provides incorrect string for integer literal '0')
PR c++/50958 gcc/cp/ * parser.c (lookup_literal_operator): New. (cp_parser_userdef_char_literal): Use it. (cp_parser_userdef_numeric_literal): Use it. (cp_parser_userdef_string_literal): Use lookup_name. libcpp/ * expr.c (cpp_userdef_char_remove_type): Fix typo. From-SVN: r181595
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/ChangeLog5
-rw-r--r--libcpp/expr.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 8f7d494fc91..5929842a4ad 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-21 Ed Smith-Rowland <3dw4rd@verizon.net>
+
+ PR c++/50958
+ * expr.c (cpp_userdef_char_remove_type): Fix typo.
+
2011-11-03 Michael Matz <matz@suse.de>
PR bootstrap/50857
diff --git a/libcpp/expr.c b/libcpp/expr.c
index 7bbc72d6f26..d56e56a6311 100644
--- a/libcpp/expr.c
+++ b/libcpp/expr.c
@@ -284,9 +284,9 @@ cpp_userdef_char_remove_type (enum cpp_ttype type)
else if (type == CPP_WCHAR_USERDEF)
return CPP_WCHAR;
else if (type == CPP_CHAR16_USERDEF)
- return CPP_STRING16;
+ return CPP_CHAR16;
else if (type == CPP_CHAR32_USERDEF)
- return CPP_STRING32;
+ return CPP_CHAR32;
else
return type;
}