Skip to content

R
riscv-gcc-1
Commit f18e0ca6 by Paolo Carlini Committed by Paolo Carlini
Options

locale_facets.tcc (num_get<>::do_get(, long&), [...]): Move inline... 

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.

From-SVN: r141520
parent 2a300344
Showing with 44 additions and 90 deletions
libstdc++-v3/ChangeLog
2008-11-01 Paolo Carlini <paolo.carlini@oracle.com> 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.
2008-11-01 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/37958 (cont) PR libstdc++/37958 (cont)
* include/bits/locale_facets.tcc (num_get<>::do_get(iter_type, * include/bits/locale_facets.tcc (num_get<>::do_get(iter_type,
iter_type, ios_base&, ios_base::iostate&, bool&): Fix again. iter_type, ios_base&, ios_base::iostate&, bool&): Fix again.
......
libstdc++-v3/include/bits/locale_facets.h
...@@ -2104,12 +2104,12 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE ...@@ -2104,12 +2104,12 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
iter_type iter_type
_M_extract_float(iter_type, iter_type, ios_base&, ios_base::iostate&, _M_extract_float(iter_type, iter_type, ios_base&, ios_base::iostate&,
string& __xtrc) const; string&) const;
template<typename _ValueT> template<typename _ValueT>
iter_type iter_type
_M_extract_int(iter_type, iter_type, ios_base&, ios_base::iostate&, _M_extract_int(iter_type, iter_type, ios_base&, ios_base::iostate&,
_ValueT& __v) const; _ValueT&) const;
template<typename _CharT2> template<typename _CharT2>
typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, int>::__type typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, int>::__type
...@@ -2167,30 +2167,36 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE ...@@ -2167,30 +2167,36 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
virtual iter_type virtual iter_type
do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const; do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const;
virtual iter_type virtual iter_type
do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, long&) const; 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 virtual iter_type
do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err, do_get(iter_type __beg, iter_type __end, ios_base& __io,
unsigned short&) const; ios_base::iostate& __err, unsigned short& __v) const
{ return _M_extract_int(__beg, __end, __io, __err, __v); }
virtual iter_type virtual iter_type
do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err, do_get(iter_type __beg, iter_type __end, ios_base& __io,
unsigned int&) const; ios_base::iostate& __err, unsigned int& __v) const
{ return _M_extract_int(__beg, __end, __io, __err, __v); }
virtual iter_type virtual iter_type
do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err, do_get(iter_type __beg, iter_type __end, ios_base& __io,
unsigned long&) const; ios_base::iostate& __err, unsigned long& __v) const
{ return _M_extract_int(__beg, __end, __io, __err, __v); }
#ifdef _GLIBCXX_USE_LONG_LONG #ifdef _GLIBCXX_USE_LONG_LONG
virtual iter_type virtual iter_type
do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err, do_get(iter_type __beg, iter_type __end, ios_base& __io,
long long&) const; ios_base::iostate& __err, long long& __v) const
{ return _M_extract_int(__beg, __end, __io, __err, __v); }
virtual iter_type virtual iter_type
do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err, do_get(iter_type __beg, iter_type __end, ios_base& __io,
unsigned long long&) const; ios_base::iostate& __err, unsigned long long& __v) const
{ return _M_extract_int(__beg, __end, __io, __err, __v); }
#endif #endif
virtual iter_type virtual iter_type
...@@ -2461,17 +2467,24 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE ...@@ -2461,17 +2467,24 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
do_put(iter_type, ios_base&, char_type __fill, bool __v) const; do_put(iter_type, ios_base&, char_type __fill, bool __v) const;
virtual iter_type virtual iter_type
do_put(iter_type, ios_base&, char_type __fill, long __v) const; 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 virtual iter_type
do_put(iter_type, ios_base&, char_type __fill, unsigned long) const; 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 #ifdef _GLIBCXX_USE_LONG_LONG
virtual iter_type virtual iter_type
do_put(iter_type, ios_base&, char_type __fill, long long __v) const; 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 virtual iter_type
do_put(iter_type, ios_base&, char_type __fill, unsigned long long) const; 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 #endif
virtual iter_type virtual iter_type
......
libstdc++-v3/include/bits/locale_facets.tcc
...@@ -663,50 +663,6 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE ...@@ -663,50 +663,6 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
_InIter _InIter
num_get<_CharT, _InIter>:: num_get<_CharT, _InIter>::
do_get(iter_type __beg, iter_type __end, ios_base& __io, 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 ios_base::iostate& __err, float& __v) const
{ {
string __xtrc; string __xtrc;
...@@ -1147,34 +1103,6 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE ...@@ -1147,34 +1103,6 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
template<typename _CharT, typename _OutIter> template<typename _CharT, typename _OutIter>
_OutIter _OutIter
num_put<_CharT, _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 do_put(iter_type __s, ios_base& __io, char_type __fill, double __v) const
{ return _M_insert_float(__s, __io, __fill, char(), __v); } { return _M_insert_float(__s, __io, __fill, char(), __v); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment