From f18e0ca6dc275a9af20034f7970de628f8bf9b03 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sat, 1 Nov 2008 17:38:39 +0000 Subject: locale_facets.tcc (num_get<>::do_get(, long&), [...]): Move inline... 2008-11-01 Paolo Carlini * 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 --- libstdc++-v3/ChangeLog | 13 ++++++ libstdc++-v3/include/bits/locale_facets.h | 49 ++++++++++++-------- libstdc++-v3/include/bits/locale_facets.tcc | 72 ----------------------------- 3 files changed, 44 insertions(+), 90 deletions(-) (limited to 'libstdc++-v3') diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cf6d99d..e3388df 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,18 @@ 2008-11-01 Paolo Carlini + * 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 + PR libstdc++/37958 (cont) * include/bits/locale_facets.tcc (num_get<>::do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&): Fix again. diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index 7280531..2e87b46 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -2104,12 +2104,12 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE iter_type _M_extract_float(iter_type, iter_type, ios_base&, ios_base::iostate&, - string& __xtrc) const; + string&) const; template iter_type _M_extract_int(iter_type, iter_type, ios_base&, ios_base::iostate&, - _ValueT& __v) const; + _ValueT&) const; template typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, int>::__type @@ -2167,30 +2167,36 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE 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; + 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, iter_type, ios_base&, ios_base::iostate& __err, - unsigned short&) const; + 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, iter_type, ios_base&, ios_base::iostate& __err, - unsigned int&) const; + 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, iter_type, ios_base&, ios_base::iostate& __err, - unsigned long&) const; + 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, iter_type, ios_base&, ios_base::iostate& __err, - long long&) const; + 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, iter_type, ios_base&, ios_base::iostate& __err, - unsigned long long&) const; + 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 @@ -2461,17 +2467,24 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE 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; + 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, 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 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 - 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 virtual iter_type diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 7dacbe5..bee770b 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -663,50 +663,6 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE _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 - _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 - _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 - _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 - _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 - _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 - _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; @@ -1147,34 +1103,6 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE template _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 - _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 - _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 - _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 - _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); } -- cgit v1.1