aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2003-04-27 19:51:25 +0000
committerAndreas Schwab <schwab@gcc.gnu.org>2003-04-27 19:51:25 +0000
commit691d089679192bd49d1e9b579588231f4be57202 (patch)
tree050b620acc0495ec14eb5a3b73bcc1db36df5cc5
parent0b50d7f1826b8093258fa0ef25164aafbf183b2f (diff)
downloadgcc-691d089679192bd49d1e9b579588231f4be57202.zip
gcc-691d089679192bd49d1e9b579588231f4be57202.tar.gz
gcc-691d089679192bd49d1e9b579588231f4be57202.tar.bz2
* config/locale/ieee_1003.1-2001/codecvt_specializations.h
(__enc_traits): Use __ibom and __ebom instead of ignoring them. From-SVN: r66136
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0642620..e17f4876 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-27 Andreas Schwab <schwab@suse.de>
+
+ * config/locale/ieee_1003.1-2001/codecvt_specializations.h
+ (__enc_traits): Use __ibom and __ebom instead of ignoring them.
+
2003-04-27 Nathan Myers <ncm@cantrip.org>
Move some basic_string members out of line because
diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h b/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
index 45c069d..9d204ed 100644
--- a/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
+++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
@@ -36,7 +36,7 @@
// Written by Benjamin Kosnik <bkoz@cygnus.com>
// XXX
- // Define this here to codecvt.cc can have _S_max_size definition.
+ // Define this here so codecvt.cc can have _S_max_size definition.
#define _GLIBCPP_USE___ENC_TRAITS 1
// Extension to use icov for dealing with character encodings,
@@ -81,7 +81,7 @@
explicit __enc_traits(const char* __int, const char* __ext,
int __ibom = 0, int __ebom = 0)
- : _M_in_desc(0), _M_out_desc(0), _M_ext_bom(0), _M_int_bom(0)
+ : _M_in_desc(0), _M_out_desc(0), _M_ext_bom(__ebom), _M_int_bom(__ibom)
{
strncpy(_M_int_enc, __int, _S_max_size);
strncpy(_M_ext_enc, __ext, _S_max_size);