From 897bb55fe36f6908d336f79c9853f1dd16058790 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 13 Dec 2001 01:41:03 +0100 Subject: [PATCH] ropeimpl.h (rope::_S_leaf_concat_char_iter, [...]): Adjust implicit typename. 2001-12-12 Paolo Carlini * include/ext/ropeimpl.h (rope::_S_leaf_concat_char_iter, _S_destr_leaf_concat_char_iter, _S_tree_concat, _S_concat_char_iter, _S_destr_concat_char_iter, _S_concat, _S_substring, _S_balance) : Adjust implicit typename. * include/ext/stl_rope.h (_Rope_iterator::operator=, rope::npos): Adjust implicit typename. * testsuite/27_io/streambuf.cc: Adjust implicit typename. From-SVN: r47958 --- libstdc++-v3/ChangeLog | 10 ++++++++++ libstdc++-v3/include/ext/ropeimpl.h | 15 ++++++++------- libstdc++-v3/include/ext/stl_rope.h | 5 +++-- libstdc++-v3/testsuite/27_io/streambuf.cc | 2 ++ 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3ce299eebb0..25078d4f101 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2001-12-12 Paolo Carlini + + * include/ext/ropeimpl.h (rope::_S_leaf_concat_char_iter, + _S_destr_leaf_concat_char_iter, _S_tree_concat, _S_concat_char_iter, + _S_destr_concat_char_iter, _S_concat, _S_substring, _S_balance) + : Adjust implicit typename. + * include/ext/stl_rope.h (_Rope_iterator::operator=, rope::npos): + Adjust implicit typename. + * testsuite/27_io/streambuf.cc: Adjust implicit typename. + 2001-12-12 Benjamin Kosnik Named locale support for ctype. diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h index 49e537b7b77..f1e84edc976 100644 --- a/libstdc++-v3/include/ext/ropeimpl.h +++ b/libstdc++-v3/include/ext/ropeimpl.h @@ -390,7 +390,7 @@ template // Concatenate a C string onto a leaf rope by copying the rope data. // Used for short ropes. template -rope<_CharT,_Alloc>::_RopeLeaf* +typename rope<_CharT,_Alloc>::_RopeLeaf* rope<_CharT,_Alloc>::_S_leaf_concat_char_iter (_RopeLeaf* __r, const _CharT* __iter, size_t __len) { @@ -418,7 +418,7 @@ rope<_CharT,_Alloc>::_S_leaf_concat_char_iter #ifndef __GC // As above, but it's OK to clobber original if refcount is 1 template -rope<_CharT,_Alloc>::_RopeLeaf* +typename rope<_CharT,_Alloc>::_RopeLeaf* rope<_CharT,_Alloc>::_S_destr_leaf_concat_char_iter (_RopeLeaf* __r, const _CharT* __iter, size_t __len) { @@ -449,7 +449,7 @@ rope<_CharT,_Alloc>::_S_destr_leaf_concat_char_iter // Does not increment (nor decrement on exception) child reference counts. // Result has ref count 1. template -rope<_CharT,_Alloc>::_RopeRep* +typename rope<_CharT,_Alloc>::_RopeRep* rope<_CharT,_Alloc>::_S_tree_concat (_RopeRep* __left, _RopeRep* __right) { _RopeConcatenation* __result = _S_new_RopeConcatenation(__left, __right, @@ -482,6 +482,7 @@ rope<_CharT,_Alloc>::_S_tree_concat (_RopeRep* __left, _RopeRep* __right) } template +typename rope<_CharT,_Alloc>::_RopeRep* rope<_CharT,_Alloc>::_S_concat_char_iter (_RopeRep* __r, const _CharT*__s, size_t __slen) { @@ -536,7 +537,7 @@ rope<_CharT,_Alloc>::_RopeRep* rope<_CharT,_Alloc>::_S_concat_char_iter #ifndef __GC template -rope<_CharT,_Alloc>::_RopeRep* +typename rope<_CharT,_Alloc>::_RopeRep* rope<_CharT,_Alloc>::_S_destr_concat_char_iter( _RopeRep* __r, const _CharT* __s, size_t __slen) { @@ -593,7 +594,7 @@ rope<_CharT,_Alloc>::_S_destr_concat_char_iter( #endif /* !__GC */ template -rope<_CharT,_Alloc>::_RopeRep* +typename rope<_CharT,_Alloc>::_RopeRep* rope<_CharT,_Alloc>::_S_concat(_RopeRep* __left, _RopeRep* __right) { if (0 == __left) { @@ -648,7 +649,7 @@ rope<_CharT,_Alloc>::_S_concat(_RopeRep* __left, _RopeRep* __right) } template -rope<_CharT,_Alloc>::_RopeRep* +typename rope<_CharT,_Alloc>::_RopeRep* rope<_CharT,_Alloc>::_S_substring(_RopeRep* __base, size_t __start, size_t __endp1) { @@ -1073,7 +1074,7 @@ rope<_CharT,_Alloc>::_S_min_len[ // These are Fibonacci numbers < 2**32. template -rope<_CharT,_Alloc>::_RopeRep* +typename rope<_CharT,_Alloc>::_RopeRep* rope<_CharT,_Alloc>::_S_balance(_RopeRep* __r) { _RopeRep* __forest[_RopeRep::_S_max_rope_depth + 1]; diff --git a/libstdc++-v3/include/ext/stl_rope.h b/libstdc++-v3/include/ext/stl_rope.h index 2fae3ccaf0b..23cc7e40f72 100644 --- a/libstdc++-v3/include/ext/stl_rope.h +++ b/libstdc++-v3/include/ext/stl_rope.h @@ -1055,7 +1055,8 @@ class _Rope_iterator : public _Rope_iterator_base<_CharT,_Alloc> { _RopeRep::_S_unref(_M_root); } _Rope_iterator& operator= (const _Rope_iterator& __x) { - _RopeRep* __old = _M_root; + typename + _Rope_iterator_base<_CharT,_Alloc>::_RopeRep* __old = _M_root; _RopeRep::_S_ref(__x._M_root); if (0 != __x._M_buf_ptr) { @@ -2183,7 +2184,7 @@ class rope : public _Rope_base<_CharT,_Alloc> { }; template -const rope<_CharT, _Alloc>::size_type rope<_CharT, _Alloc>::npos = +const typename rope<_CharT, _Alloc>::size_type rope<_CharT, _Alloc>::npos = (size_type)(-1); template diff --git a/libstdc++-v3/testsuite/27_io/streambuf.cc b/libstdc++-v3/testsuite/27_io/streambuf.cc index 62c965ff253..a560390fdc7 100644 --- a/libstdc++-v3/testsuite/27_io/streambuf.cc +++ b/libstdc++-v3/testsuite/27_io/streambuf.cc @@ -197,6 +197,8 @@ template > class basic_nullbuf : public std::basic_streambuf { protected: + typedef typename + std::basic_streambuf::int_type int_type; virtual int_type overflow(int_type c) { return traits::not_eof(c); } -- 2.30.2