Commit 2803847d by Benjamin Kosnik Committed by Benjamin Kosnik

basic_ios.h: Remove *_iter typedefs, change num* typedefs to num_*.


2003-08-11  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/basic_ios.h: Remove *_iter typedefs, change num*
	typedefs to num_*.
	* include/bits/basic_ios.tcc: Same.
	* include/bits/istream.tcc: Same.
	* include/bits/locale_facets.h: Same.
	* include/bits/ostream.tcc: Same.
	* include/std/std_istream.h: Same.
	* include/std/std_ostream.h: Same.
	* testsuite/26_numerics/complex_inserters_extractors.cc: Fix.

	* include/ext/rope: Remove build warning.

From-SVN: r70357
parent 4ac11022
2003-08-11 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/basic_ios.h: Remove *_iter typedefs, change num*
typedefs to num_*.
* include/bits/basic_ios.tcc: Same.
* include/bits/istream.tcc: Same.
* include/bits/locale_facets.h: Same.
* include/bits/ostream.tcc: Same.
* include/std/std_istream.h: Same.
* include/std/std_ostream.h: Same.
* testsuite/26_numerics/complex_inserters_extractors.cc: Fix.
* include/ext/rope: Remove build warning.
2003-08-11 Andreas Jaeger <aj@suse.de> 2003-08-11 Andreas Jaeger <aj@suse.de>
* include/Makefile.am (stamp-c_base): Add dependency on stamp-bits * include/Makefile.am (stamp-c_base): Add dependency on stamp-bits
......
...@@ -76,10 +76,10 @@ namespace std ...@@ -76,10 +76,10 @@ namespace std
* @endif * @endif
*/ */
typedef ctype<_CharT> __ctype_type; typedef ctype<_CharT> __ctype_type;
typedef ostreambuf_iterator<_CharT, _Traits> __ostreambuf_iter; typedef num_put<_CharT, ostreambuf_iterator<_CharT, _Traits> >
typedef num_put<_CharT, __ostreambuf_iter> __numput_type; __num_put_type;
typedef istreambuf_iterator<_CharT, _Traits> __istreambuf_iter; typedef num_get<_CharT, istreambuf_iterator<_CharT, _Traits> >
typedef num_get<_CharT, __istreambuf_iter> __numget_type; __num_get_type;
//@} //@}
// Data members: // Data members:
...@@ -92,9 +92,9 @@ namespace std ...@@ -92,9 +92,9 @@ namespace std
// Cached use_facet<ctype>, which is based on the current locale info. // Cached use_facet<ctype>, which is based on the current locale info.
const __ctype_type* _M_ctype; const __ctype_type* _M_ctype;
// For ostream. // For ostream.
const __numput_type* _M_num_put; const __num_put_type* _M_num_put;
// For istream. // For istream.
const __numget_type* _M_num_get; const __num_get_type* _M_num_get;
public: public:
//@{ //@{
......
...@@ -167,10 +167,10 @@ namespace std ...@@ -167,10 +167,10 @@ namespace std
{ {
if (__builtin_expect(has_facet<__ctype_type>(__loc), true)) if (__builtin_expect(has_facet<__ctype_type>(__loc), true))
_M_ctype = &use_facet<__ctype_type>(__loc); _M_ctype = &use_facet<__ctype_type>(__loc);
if (__builtin_expect(has_facet<__numput_type>(__loc), true)) if (__builtin_expect(has_facet<__num_put_type>(__loc), true))
_M_num_put = &use_facet<__numput_type>(__loc); _M_num_put = &use_facet<__num_put_type>(__loc);
if (__builtin_expect(has_facet<__numget_type>(__loc), true)) if (__builtin_expect(has_facet<__num_get_type>(__loc), true))
_M_num_get = &use_facet<__numget_type>(__loc); _M_num_get = &use_facet<__num_get_type>(__loc);
} }
// Inhibit implicit instantiations for required instantiations, // Inhibit implicit instantiations for required instantiations,
......
...@@ -56,10 +56,10 @@ namespace std ...@@ -56,10 +56,10 @@ namespace std
__streambuf_type* __sb = __in.rdbuf(); __streambuf_type* __sb = __in.rdbuf();
__int_type __c = __sb->sgetc(); __int_type __c = __sb->sgetc();
__check_facet(__in._M_ctype); const __ctype_type& __ct = __check_facet(__in._M_ctype);
while (!traits_type::eq_int_type(__c, __eof) while (!traits_type::eq_int_type(__c, __eof)
&& __in._M_ctype->is(ctype_base::space, && __ct.is(ctype_base::space,
traits_type::to_char_type(__c))) traits_type::to_char_type(__c)))
__c = __sb->snextc(); __c = __sb->snextc();
#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS #ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
...@@ -117,7 +117,8 @@ namespace std ...@@ -117,7 +117,8 @@ namespace std
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n); const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __n);
this->setstate(__err); this->setstate(__err);
} }
catch(...) catch(...)
...@@ -142,9 +143,10 @@ namespace std ...@@ -142,9 +143,10 @@ namespace std
{ {
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
long __l; long __l;
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __l); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __l);
#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS #ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
// 118. basic_istream uses nonexistent num_get member functions. // 118. basic_istream uses nonexistent num_get member functions.
if (!(__err & ios_base::failbit) if (!(__err & ios_base::failbit)
...@@ -179,7 +181,8 @@ namespace std ...@@ -179,7 +181,8 @@ namespace std
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n); const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __n);
this->setstate(__err); this->setstate(__err);
} }
catch(...) catch(...)
...@@ -204,9 +207,10 @@ namespace std ...@@ -204,9 +207,10 @@ namespace std
{ {
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
long __l; long __l;
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __l); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __l);
#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS #ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
// 118. basic_istream uses nonexistent num_get member functions. // 118. basic_istream uses nonexistent num_get member functions.
if (!(__err & ios_base::failbit) if (!(__err & ios_base::failbit)
...@@ -241,7 +245,8 @@ namespace std ...@@ -241,7 +245,8 @@ namespace std
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n); const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __n);
this->setstate(__err); this->setstate(__err);
} }
catch(...) catch(...)
...@@ -267,7 +272,8 @@ namespace std ...@@ -267,7 +272,8 @@ namespace std
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n); const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __n);
this->setstate(__err); this->setstate(__err);
} }
catch(...) catch(...)
...@@ -293,7 +299,8 @@ namespace std ...@@ -293,7 +299,8 @@ namespace std
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n); const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __n);
this->setstate(__err); this->setstate(__err);
} }
catch(...) catch(...)
...@@ -320,7 +327,8 @@ namespace std ...@@ -320,7 +327,8 @@ namespace std
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n); const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __n);
this->setstate(__err); this->setstate(__err);
} }
catch(...) catch(...)
...@@ -346,7 +354,8 @@ namespace std ...@@ -346,7 +354,8 @@ namespace std
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n); const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __n);
this->setstate(__err); this->setstate(__err);
} }
catch(...) catch(...)
...@@ -373,7 +382,8 @@ namespace std ...@@ -373,7 +382,8 @@ namespace std
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n); const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __n);
this->setstate(__err); this->setstate(__err);
} }
catch(...) catch(...)
...@@ -399,7 +409,8 @@ namespace std ...@@ -399,7 +409,8 @@ namespace std
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n); const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __n);
this->setstate(__err); this->setstate(__err);
} }
catch(...) catch(...)
...@@ -425,7 +436,8 @@ namespace std ...@@ -425,7 +436,8 @@ namespace std
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n); const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __n);
this->setstate(__err); this->setstate(__err);
} }
catch(...) catch(...)
...@@ -451,7 +463,8 @@ namespace std ...@@ -451,7 +463,8 @@ namespace std
try try
{ {
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
__check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n); const __num_get_type& __ng = __check_facet(this->_M_num_get);
__ng.get(*this, 0, *this, __err, __n);
this->setstate(__err); this->setstate(__err);
} }
catch(...) catch(...)
...@@ -1027,14 +1040,16 @@ namespace std ...@@ -1027,14 +1040,16 @@ namespace std
if (__num <= 0) if (__num <= 0)
__num = numeric_limits<streamsize>::max(); __num = numeric_limits<streamsize>::max();
const __ctype_type& __ctype = use_facet<__ctype_type>(__in.getloc()); const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
const int_type __eof = _Traits::eof(); const int_type __eof = _Traits::eof();
__streambuf_type* __sb = __in.rdbuf(); __streambuf_type* __sb = __in.rdbuf();
int_type __c = __sb->sgetc(); int_type __c = __sb->sgetc();
while (__extracted < __num - 1 while (__extracted < __num - 1
&& !_Traits::eq_int_type(__c, __eof) && !_Traits::eq_int_type(__c, __eof)
&& !__ctype.is(ctype_base::space, _Traits::to_char_type(__c))) && !__ct.is(ctype_base::space,
_Traits::to_char_type(__c)))
{ {
*__s++ = _Traits::to_char_type(__c); *__s++ = _Traits::to_char_type(__c);
++__extracted; ++__extracted;
...@@ -1073,13 +1088,13 @@ namespace std ...@@ -1073,13 +1088,13 @@ namespace std
typedef typename __istream_type::__ctype_type __ctype_type; typedef typename __istream_type::__ctype_type __ctype_type;
typedef typename __istream_type::int_type __int_type; typedef typename __istream_type::int_type __int_type;
const __ctype_type& __ctype = use_facet<__ctype_type>(__in.getloc()); const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
const __int_type __eof = _Traits::eof(); const __int_type __eof = _Traits::eof();
__streambuf_type* __sb = __in.rdbuf(); __streambuf_type* __sb = __in.rdbuf();
__int_type __c = __sb->sgetc(); __int_type __c = __sb->sgetc();
while (!_Traits::eq_int_type(__c, __eof) while (!_Traits::eq_int_type(__c, __eof)
&& __ctype.is(ctype_base::space, _Traits::to_char_type(__c))) && __ct.is(ctype_base::space, _Traits::to_char_type(__c)))
__c = __sb->snextc(); __c = __sb->snextc();
if (_Traits::eq_int_type(__c, __eof)) if (_Traits::eq_int_type(__c, __eof))
...@@ -1110,14 +1125,14 @@ namespace std ...@@ -1110,14 +1125,14 @@ namespace std
__size_type __n; __size_type __n;
__n = __w > 0 ? static_cast<__size_type>(__w) : __str.max_size(); __n = __w > 0 ? static_cast<__size_type>(__w) : __str.max_size();
const __ctype_type& __ctype = use_facet<__ctype_type>(__in.getloc()); const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
const __int_type __eof = _Traits::eof(); const __int_type __eof = _Traits::eof();
__streambuf_type* __sb = __in.rdbuf(); __streambuf_type* __sb = __in.rdbuf();
__int_type __c = __sb->sgetc(); __int_type __c = __sb->sgetc();
while (__extracted < __n while (__extracted < __n
&& !_Traits::eq_int_type(__c, __eof) && !_Traits::eq_int_type(__c, __eof)
&& !__ctype.is(ctype_base::space, _Traits::to_char_type(__c))) && !__ct.is(ctype_base::space, _Traits::to_char_type(__c)))
{ {
__str += _Traits::to_char_type(__c); __str += _Traits::to_char_type(__c);
++__extracted; ++__extracted;
...@@ -1161,8 +1176,7 @@ namespace std ...@@ -1161,8 +1176,7 @@ namespace std
const __int_type __eof = _Traits::eof(); const __int_type __eof = _Traits::eof();
__testdelim = _Traits::eq_int_type(__c, __idelim); __testdelim = _Traits::eq_int_type(__c, __idelim);
while (__extracted <= __n while (__extracted <= __n && !_Traits::eq_int_type(__c, __eof)
&& !_Traits::eq_int_type(__c, __eof)
&& !__testdelim) && !__testdelim)
{ {
__str += _Traits::to_char_type(__c); __str += _Traits::to_char_type(__c);
......
...@@ -917,22 +917,6 @@ namespace std ...@@ -917,22 +917,6 @@ namespace std
template<typename _CharT, typename _InIter> template<typename _CharT, typename _InIter>
locale::id num_get<_CharT, _InIter>::id; locale::id num_get<_CharT, _InIter>::id;
#if 0
// Partial specialization for istreambuf_iterator, so can use traits_type.
template<typename _CharT>
class num_get<_CharT, istreambuf_iterator<_CharT> >;
iter_type
_M_extract_float(iter_type, iter_type, ios_base&, ios_base::iostate&,
string& __xtrc) const;
iter_type
_M_extract_int(iter_type, iter_type, ios_base&, ios_base::iostate&,
string& __xtrc, int& __base) const;
virtual iter_type
do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const;
#endif
template<typename _CharT, typename _OutIter> template<typename _CharT, typename _OutIter>
class num_put : public locale::facet, public __num_base class num_put : public locale::facet, public __num_base
......
...@@ -160,9 +160,8 @@ namespace std ...@@ -160,9 +160,8 @@ namespace std
{ {
try try
{ {
__check_facet(this->_M_num_put); const __num_put_type& __np = __check_facet(this->_M_num_put);
if (this->_M_num_put->put(*this, *this, this->fill(), if (__np.put(*this, *this, this->fill(), __n).failed())
__n).failed())
this->setstate(ios_base::badbit); this->setstate(ios_base::badbit);
} }
catch(...) catch(...)
...@@ -189,14 +188,14 @@ namespace std ...@@ -189,14 +188,14 @@ namespace std
bool __b = false; bool __b = false;
char_type __c = this->fill(); char_type __c = this->fill();
ios_base::fmtflags __fmt = this->flags() & ios_base::basefield; ios_base::fmtflags __fmt = this->flags() & ios_base::basefield;
__check_facet(this->_M_num_put); const __num_put_type& __np = __check_facet(this->_M_num_put);
if ((__fmt & ios_base::oct) || (__fmt & ios_base::hex)) if ((__fmt & ios_base::oct) || (__fmt & ios_base::hex))
{ {
unsigned long __l = static_cast<unsigned long>(__n); unsigned long __l = static_cast<unsigned long>(__n);
__b = this->_M_num_put->put(*this, *this, __c, __l).failed(); __b = __np.put(*this, *this, __c, __l).failed();
} }
else else
__b = this->_M_num_put->put(*this, *this, __c, __n).failed(); __b = __np.put(*this, *this, __c, __n).failed();
if (__b) if (__b)
this->setstate(ios_base::badbit); this->setstate(ios_base::badbit);
} }
...@@ -221,9 +220,8 @@ namespace std ...@@ -221,9 +220,8 @@ namespace std
{ {
try try
{ {
__check_facet(this->_M_num_put); const __num_put_type& __np = __check_facet(this->_M_num_put);
if (this->_M_num_put->put(*this, *this, this->fill(), if (__np.put(*this, *this, this->fill(), __n).failed())
__n).failed())
this->setstate(ios_base::badbit); this->setstate(ios_base::badbit);
} }
catch(...) catch(...)
...@@ -251,15 +249,15 @@ namespace std ...@@ -251,15 +249,15 @@ namespace std
bool __b = false; bool __b = false;
char_type __c = this->fill(); char_type __c = this->fill();
ios_base::fmtflags __fmt = this->flags() & ios_base::basefield; ios_base::fmtflags __fmt = this->flags() & ios_base::basefield;
__check_facet(this->_M_num_put); const __num_put_type& __np = __check_facet(this->_M_num_put);
if ((__fmt & ios_base::oct) || (__fmt & ios_base::hex)) if ((__fmt & ios_base::oct) || (__fmt & ios_base::hex))
{ {
unsigned long long __l; unsigned long long __l;
__l = static_cast<unsigned long long>(__n); __l = static_cast<unsigned long long>(__n);
__b = this->_M_num_put->put(*this, *this, __c, __l).failed(); __b = __np.put(*this, *this, __c, __l).failed();
} }
else else
__b = this->_M_num_put->put(*this, *this, __c, __n).failed(); __b = __np.put(*this, *this, __c, __n).failed();
if (__b) if (__b)
this->setstate(ios_base::badbit); this->setstate(ios_base::badbit);
} }
...@@ -284,9 +282,8 @@ namespace std ...@@ -284,9 +282,8 @@ namespace std
{ {
try try
{ {
__check_facet(this->_M_num_put); const __num_put_type& __np = __check_facet(this->_M_num_put);
if (this->_M_num_put->put(*this, *this, this->fill(), if (__np.put(*this, *this, this->fill(), __n).failed())
__n).failed())
this->setstate(ios_base::badbit); this->setstate(ios_base::badbit);
} }
catch(...) catch(...)
...@@ -311,9 +308,8 @@ namespace std ...@@ -311,9 +308,8 @@ namespace std
{ {
try try
{ {
__check_facet(this->_M_num_put); const __num_put_type& __np = __check_facet(this->_M_num_put);
if (this->_M_num_put->put(*this, *this, this->fill(), if (__np.put(*this, *this, this->fill(), __n).failed())
__n).failed())
this->setstate(ios_base::badbit); this->setstate(ios_base::badbit);
} }
catch(...) catch(...)
...@@ -337,9 +333,8 @@ namespace std ...@@ -337,9 +333,8 @@ namespace std
{ {
try try
{ {
__check_facet(this->_M_num_put); const __num_put_type& __np = __check_facet(this->_M_num_put);
if (this->_M_num_put->put(*this, *this, this->fill(), if (__np.put(*this, *this, this->fill(), __n).failed())
__n).failed())
this->setstate(ios_base::badbit); this->setstate(ios_base::badbit);
} }
catch(...) catch(...)
...@@ -363,9 +358,8 @@ namespace std ...@@ -363,9 +358,8 @@ namespace std
{ {
try try
{ {
__check_facet(this->_M_num_put); const __num_put_type& __np = __check_facet(this->_M_num_put);
if (this->_M_num_put->put(*this, *this, this->fill(), if (__np.put(*this, *this, this->fill(), __n).failed())
__n).failed())
this->setstate(ios_base::badbit); this->setstate(ios_base::badbit);
} }
catch(...) catch(...)
......
...@@ -189,8 +189,7 @@ class sequence_buffer : public iterator<std::output_iterator_tag,void,void,void, ...@@ -189,8 +189,7 @@ class sequence_buffer : public iterator<std::output_iterator_tag,void,void,void,
{ {
if (__len + _M_buf_count <= _Buf_sz) { if (__len + _M_buf_count <= _Buf_sz) {
size_t __i = _M_buf_count; size_t __i = _M_buf_count;
size_t __j = 0; for (size_t __j = 0; __j < __len; __i++, __j++) {
for (; __j < __len; __i++, __j++) {
_M_buffer[__i] = __s[__j]; _M_buffer[__i] = __s[__j];
} }
_M_buf_count += __len; _M_buf_count += __len;
......
...@@ -70,8 +70,8 @@ namespace std ...@@ -70,8 +70,8 @@ namespace std
typedef basic_streambuf<_CharT, _Traits> __streambuf_type; typedef basic_streambuf<_CharT, _Traits> __streambuf_type;
typedef basic_ios<_CharT, _Traits> __ios_type; typedef basic_ios<_CharT, _Traits> __ios_type;
typedef basic_istream<_CharT, _Traits> __istream_type; typedef basic_istream<_CharT, _Traits> __istream_type;
typedef istreambuf_iterator<_CharT, _Traits> __istreambuf_iter; typedef num_get<_CharT, istreambuf_iterator<_CharT, _Traits> >
typedef num_get<_CharT, __istreambuf_iter> __numget_type; __num_get_type;
typedef ctype<_CharT> __ctype_type; typedef ctype<_CharT> __ctype_type;
template<typename _CharT2, typename _Traits2> template<typename _CharT2, typename _Traits2>
......
...@@ -69,8 +69,8 @@ namespace std ...@@ -69,8 +69,8 @@ namespace std
typedef basic_streambuf<_CharT, _Traits> __streambuf_type; typedef basic_streambuf<_CharT, _Traits> __streambuf_type;
typedef basic_ios<_CharT, _Traits> __ios_type; typedef basic_ios<_CharT, _Traits> __ios_type;
typedef basic_ostream<_CharT, _Traits> __ostream_type; typedef basic_ostream<_CharT, _Traits> __ostream_type;
typedef ostreambuf_iterator<_CharT, _Traits> __ostreambuf_iter; typedef num_put<_CharT, ostreambuf_iterator<_CharT, _Traits> >
typedef num_put<_CharT, __ostreambuf_iter> __numput_type; __num_put_type;
typedef ctype<_CharT> __ctype_type; typedef ctype<_CharT> __ctype_type;
template<typename _CharT2, typename _Traits2> template<typename _CharT2, typename _Traits2>
......
...@@ -108,8 +108,8 @@ void test02() ...@@ -108,8 +108,8 @@ void test02()
bool test = true; bool test = true;
// Construct locale with specialized facets. // Construct locale with specialized facets.
typedef gnu_sstream::__numput_type numput_type; typedef gnu_sstream::__num_put_type numput_type;
typedef gnu_sstream::__numget_type numget_type; typedef gnu_sstream::__num_get_type numget_type;
std::locale loc_c = std::locale::classic(); std::locale loc_c = std::locale::classic();
std::locale loc_1(loc_c, new numput_type); std::locale loc_1(loc_c, new numput_type);
std::locale loc_2(loc_1, new numget_type); std::locale loc_2(loc_1, new numget_type);
......
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