diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2007-10-11 10:50:09 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-10-11 10:50:09 +0000 |
| commit | 5f2322320155f42550aee3a0d899df5c7a93ba91 (patch) | |
| tree | 883f150586300b5e1f33c339e9cbca4ff900737d | |
| parent | a6bda7d08bba0105f6e490bcbb8287684643990f (diff) | |
| download | gcc-5f2322320155f42550aee3a0d899df5c7a93ba91.zip gcc-5f2322320155f42550aee3a0d899df5c7a93ba91.tar.gz gcc-5f2322320155f42550aee3a0d899df5c7a93ba91.tar.bz2 | |
re PR libstdc++/33734 (iconv_t must not be assumed to be a pointer)
2007-10-11 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/33734
* include/ext/codecvt_specializations.h (encoding_state::good,
init, destroy): Use cast notation instead of reinterpret_cast.
From-SVN: r129232
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/codecvt_specializations.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3244929..9dc29ae 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2007-10-11 Paolo Carlini <pcarlini@suse.de> + PR libstdc++/33734 + * include/ext/codecvt_specializations.h (encoding_state::good, + init, destroy): Use cast notation instead of reinterpret_cast. + +2007-10-11 Paolo Carlini <pcarlini@suse.de> + * testsuite/25_algorithms/heap/moveable.cc: Fix and extend. 2007-10-11 Danny Smith <dannysmith@users.sourceforge.net> diff --git a/libstdc++-v3/include/ext/codecvt_specializations.h b/libstdc++-v3/include/ext/codecvt_specializations.h index c0563ac..ea5b8a1 100644 --- a/libstdc++-v3/include/ext/codecvt_specializations.h +++ b/libstdc++-v3/include/ext/codecvt_specializations.h @@ -121,7 +121,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) bool good() const throw() { - const descriptor_type __err = reinterpret_cast<iconv_t>(-1); + const descriptor_type __err = (iconv_t)(-1); bool __test = _M_in_desc && _M_in_desc != __err; __test &= _M_out_desc && _M_out_desc != __err; return __test; @@ -159,7 +159,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) void init() { - const descriptor_type __err = reinterpret_cast<iconv_t>(-1); + const descriptor_type __err = (iconv_t)(-1); const bool __have_encodings = _M_int_enc.size() && _M_ext_enc.size(); if (!_M_in_desc && __have_encodings) { @@ -192,7 +192,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) void destroy() throw() { - const descriptor_type __err = reinterpret_cast<iconv_t>(-1); + const descriptor_type __err = (iconv_t)(-1); if (_M_in_desc && _M_in_desc != __err) { iconv_close(_M_in_desc); |