From 5b3f6d1a469246362fec0726b34a71d0bb5da96b Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 2 Apr 2007 09:49:31 +0000 Subject: [PATCH] locale_facets.tcc (num_put<>::do_put(iter_type, ios_base&, char_type, const void*)): Fix for sizeof(const void*) > sizeof(unsigned long). 2007-04-02 Paolo Carlini * include/bits/locale_facets.tcc (num_put<>::do_put(iter_type, ios_base&, char_type, const void*)): Fix for sizeof(const void*) > sizeof(unsigned long). From-SVN: r123421 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/locale_facets.tcc | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 371360a4bd1..62bbca9db33 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2007-04-02 Paolo Carlini + + * include/bits/locale_facets.tcc (num_put<>::do_put(iter_type, + ios_base&, char_type, const void*)): Fix for sizeof(const void*) + > sizeof(unsigned long). + 2007-04-01 Andreas Tobler * include/tr1/poly_laguerre.tcc: Missing s/__alpha/__alpha1, line 278. diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index b6feda0c0df..8290d4ae5b3 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1313,8 +1313,12 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE | ios_base::internal); __io.flags((__flags & __fmt) | (ios_base::hex | ios_base::showbase)); + typedef __gnu_cxx::__conditional_type<(sizeof(const void*) + <= sizeof(unsigned long)), + unsigned long, unsigned long long>::__type _UIntPtrType; + __s = _M_insert_int(__s, __io, __fill, - reinterpret_cast(__v)); + reinterpret_cast<_UIntPtrType>(__v)); __io.flags(__flags); return __s; } -- 2.30.2