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  <pcarlini@suse.de>

	* 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
This commit is contained in:
Paolo Carlini 2007-04-02 09:49:31 +00:00 committed by Paolo Carlini
parent ae65d51219
commit 5b3f6d1a46
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2007-04-02 Paolo Carlini <pcarlini@suse.de>
* 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 <a.tobler@schweiz.org>
* include/tr1/poly_laguerre.tcc: Missing s/__alpha/__alpha1, line 278.

View File

@ -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<unsigned long>(__v));
reinterpret_cast<_UIntPtrType>(__v));
__io.flags(__flags);
return __s;
}