This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[v3] num_get<>::do_get / num_put<>::do_put clean-up
- From: Paolo Carlini <paolo dot carlini at oracle dot com>
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Cc: libstdc++ <libstdc++ at gcc dot gnu dot org>
- Date: Sat, 01 Nov 2008 18:40:28 +0100
- Subject: [v3] num_get<>::do_get / num_put<>::do_put clean-up
Hi,
tested x86_64-linux, committed to mainline.
Paolo.
///////////////////
2008-11-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/locale_facets.tcc (num_get<>::do_get(, long&),
num_get<>::do_get(, unsigned short&),
num_get<>::do_get(, unsigned int&),
num_get<>::do_get(, unsigned long&),
num_get<>::do_get(, long long&),
num_get<>::do_get(, unsigned long long&),
num_put<>::do_put(, long), num_put<>::do_put(, unsigned long),
num_put<>::do_put(, long long),
num_put<>::do_put(, unsigned long long)): Move inline...
* include/bits/locale_facets.h: ... here.
Index: include/bits/locale_facets.tcc
===================================================================
*** include/bits/locale_facets.tcc (revision 141517)
--- include/bits/locale_facets.tcc (working copy)
*************** _GLIBCXX_BEGIN_LDBL_NAMESPACE
*** 663,712 ****
_InIter
num_get<_CharT, _InIter>::
do_get(iter_type __beg, iter_type __end, ios_base& __io,
- ios_base::iostate& __err, long& __v) const
- { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
- template<typename _CharT, typename _InIter>
- _InIter
- num_get<_CharT, _InIter>::
- do_get(iter_type __beg, iter_type __end, ios_base& __io,
- ios_base::iostate& __err, unsigned short& __v) const
- { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
- template<typename _CharT, typename _InIter>
- _InIter
- num_get<_CharT, _InIter>::
- do_get(iter_type __beg, iter_type __end, ios_base& __io,
- ios_base::iostate& __err, unsigned int& __v) const
- { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
- template<typename _CharT, typename _InIter>
- _InIter
- num_get<_CharT, _InIter>::
- do_get(iter_type __beg, iter_type __end, ios_base& __io,
- ios_base::iostate& __err, unsigned long& __v) const
- { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
- #ifdef _GLIBCXX_USE_LONG_LONG
- template<typename _CharT, typename _InIter>
- _InIter
- num_get<_CharT, _InIter>::
- do_get(iter_type __beg, iter_type __end, ios_base& __io,
- ios_base::iostate& __err, long long& __v) const
- { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
- template<typename _CharT, typename _InIter>
- _InIter
- num_get<_CharT, _InIter>::
- do_get(iter_type __beg, iter_type __end, ios_base& __io,
- ios_base::iostate& __err, unsigned long long& __v) const
- { return _M_extract_int(__beg, __end, __io, __err, __v); }
- #endif
-
- template<typename _CharT, typename _InIter>
- _InIter
- num_get<_CharT, _InIter>::
- do_get(iter_type __beg, iter_type __end, ios_base& __io,
ios_base::iostate& __err, float& __v) const
{
string __xtrc;
--- 663,668 ----
*************** _GLIBCXX_BEGIN_LDBL_NAMESPACE
*** 1146,1179 ****
template<typename _CharT, typename _OutIter>
_OutIter
- num_put<_CharT, _OutIter>::
- do_put(iter_type __s, ios_base& __io, char_type __fill, long __v) const
- { return _M_insert_int(__s, __io, __fill, __v); }
-
- template<typename _CharT, typename _OutIter>
- _OutIter
- num_put<_CharT, _OutIter>::
- do_put(iter_type __s, ios_base& __io, char_type __fill,
- unsigned long __v) const
- { return _M_insert_int(__s, __io, __fill, __v); }
-
- #ifdef _GLIBCXX_USE_LONG_LONG
- template<typename _CharT, typename _OutIter>
- _OutIter
- num_put<_CharT, _OutIter>::
- do_put(iter_type __s, ios_base& __io, char_type __fill, long long __v) const
- { return _M_insert_int(__s, __io, __fill, __v); }
-
- template<typename _CharT, typename _OutIter>
- _OutIter
- num_put<_CharT, _OutIter>::
- do_put(iter_type __s, ios_base& __io, char_type __fill,
- unsigned long long __v) const
- { return _M_insert_int(__s, __io, __fill, __v); }
- #endif
-
- template<typename _CharT, typename _OutIter>
- _OutIter
num_put<_CharT, _OutIter>::
do_put(iter_type __s, ios_base& __io, char_type __fill, double __v) const
{ return _M_insert_float(__s, __io, __fill, char(), __v); }
--- 1102,1107 ----
Index: include/bits/locale_facets.h
===================================================================
*** include/bits/locale_facets.h (revision 141517)
--- include/bits/locale_facets.h (working copy)
*************** _GLIBCXX_BEGIN_LDBL_NAMESPACE
*** 2104,2115 ****
iter_type
_M_extract_float(iter_type, iter_type, ios_base&, ios_base::iostate&,
! string& __xtrc) const;
template<typename _ValueT>
iter_type
_M_extract_int(iter_type, iter_type, ios_base&, ios_base::iostate&,
! _ValueT& __v) const;
template<typename _CharT2>
typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, int>::__type
--- 2104,2115 ----
iter_type
_M_extract_float(iter_type, iter_type, ios_base&, ios_base::iostate&,
! string&) const;
template<typename _ValueT>
iter_type
_M_extract_int(iter_type, iter_type, ios_base&, ios_base::iostate&,
! _ValueT&) const;
template<typename _CharT2>
typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, int>::__type
*************** _GLIBCXX_BEGIN_LDBL_NAMESPACE
*** 2167,2196 ****
virtual iter_type
do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const;
-
virtual iter_type
! do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, long&) const;
virtual iter_type
! do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
! unsigned short&) const;
virtual iter_type
! do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
! unsigned int&) const;
virtual iter_type
! do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
! unsigned long&) const;
#ifdef _GLIBCXX_USE_LONG_LONG
virtual iter_type
! do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
! long long&) const;
virtual iter_type
! do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
! unsigned long long&) const;
#endif
virtual iter_type
--- 2167,2202 ----
virtual iter_type
do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const;
virtual iter_type
! do_get(iter_type __beg, iter_type __end, ios_base& __io,
! ios_base::iostate& __err, long& __v) const
! { return _M_extract_int(__beg, __end, __io, __err, __v); }
virtual iter_type
! do_get(iter_type __beg, iter_type __end, ios_base& __io,
! ios_base::iostate& __err, unsigned short& __v) const
! { return _M_extract_int(__beg, __end, __io, __err, __v); }
virtual iter_type
! do_get(iter_type __beg, iter_type __end, ios_base& __io,
! ios_base::iostate& __err, unsigned int& __v) const
! { return _M_extract_int(__beg, __end, __io, __err, __v); }
virtual iter_type
! do_get(iter_type __beg, iter_type __end, ios_base& __io,
! ios_base::iostate& __err, unsigned long& __v) const
! { return _M_extract_int(__beg, __end, __io, __err, __v); }
#ifdef _GLIBCXX_USE_LONG_LONG
virtual iter_type
! do_get(iter_type __beg, iter_type __end, ios_base& __io,
! ios_base::iostate& __err, long long& __v) const
! { return _M_extract_int(__beg, __end, __io, __err, __v); }
virtual iter_type
! do_get(iter_type __beg, iter_type __end, ios_base& __io,
! ios_base::iostate& __err, unsigned long long& __v) const
! { return _M_extract_int(__beg, __end, __io, __err, __v); }
#endif
virtual iter_type
*************** _GLIBCXX_BEGIN_LDBL_NAMESPACE
*** 2461,2477 ****
do_put(iter_type, ios_base&, char_type __fill, bool __v) const;
virtual iter_type
! do_put(iter_type, ios_base&, char_type __fill, long __v) const;
virtual iter_type
! do_put(iter_type, ios_base&, char_type __fill, unsigned long) const;
#ifdef _GLIBCXX_USE_LONG_LONG
virtual iter_type
! do_put(iter_type, ios_base&, char_type __fill, long long __v) const;
virtual iter_type
! do_put(iter_type, ios_base&, char_type __fill, unsigned long long) const;
#endif
virtual iter_type
--- 2467,2490 ----
do_put(iter_type, ios_base&, char_type __fill, bool __v) const;
virtual iter_type
! do_put(iter_type __s, ios_base& __io, char_type __fill, long __v) const
! { return _M_insert_int(__s, __io, __fill, __v); }
virtual iter_type
! do_put(iter_type __s, ios_base& __io, char_type __fill,
! unsigned long __v) const
! { return _M_insert_int(__s, __io, __fill, __v); }
#ifdef _GLIBCXX_USE_LONG_LONG
virtual iter_type
! do_put(iter_type __s, ios_base& __io, char_type __fill,
! long long __v) const
! { return _M_insert_int(__s, __io, __fill, __v); }
virtual iter_type
! do_put(iter_type __s, ios_base& __io, char_type __fill,
! unsigned long long __v) const
! { return _M_insert_int(__s, __io, __fill, __v); }
#endif
virtual iter_type