aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2004-01-22 14:25:37 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2004-01-22 14:25:37 +0000
commitba46e66a8bd646e8b8f4a34ab0c69c47d7aca33d (patch)
tree0baedfd2455fa86f1b53b89ac676c156efdccf44
parent7bb9b33b3b89f6c0b78e069fbcb596472440d2e7 (diff)
downloadgcc-ba46e66a8bd646e8b8f4a34ab0c69c47d7aca33d.zip
gcc-ba46e66a8bd646e8b8f4a34ab0c69c47d7aca33d.tar.gz
gcc-ba46e66a8bd646e8b8f4a34ab0c69c47d7aca33d.tar.bz2
locale_facets.tcc (money_put::do_put(..., long double)): Use the basic_string constructor for char arrays...
2004-01-22 Paolo Carlini <pcarlini@suse.de> * include/bits/locale_facets.tcc (money_put::do_put(..., long double)): Use the basic_string constructor for char arrays, not that for C-strings, to pass __digits to do_put(..., const string_type&): __ws isn't null-terminated. From-SVN: r76355
-rw-r--r--libstdc++-v3/ChangeLog8
-rw-r--r--libstdc++-v3/include/bits/locale_facets.tcc2
2 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1597359..ca2e835 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,13 @@
2004-01-22 Paolo Carlini <pcarlini@suse.de>
+ * include/bits/locale_facets.tcc
+ (money_put::do_put(..., long double)): Use the basic_string
+ constructor for char arrays, not that for C-strings, to pass
+ __digits to do_put(..., const string_type&): __ws isn't
+ null-terminated.
+
+2004-01-22 Paolo Carlini <pcarlini@suse.de>
+
* include/bits/basic_string.h (_M_replace_safe): Change
signatures to take size_types and const _CharT*.
(_M_replace_aux): Likewise, takes size_types instead of
diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 4dc3bb4..c059889 100644
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -1385,7 +1385,7 @@ namespace std
_CharT* __ws = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __cs_size));
__ctype.widen(__cs, __cs + __len, __ws);
- string_type __digits(__ws);
+ const string_type __digits(__ws, __len);
return this->do_put(__s, __intl, __io, __fill, __digits);
}