diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/stl_rope.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ee885008a97..df541cd5c00 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2001-12-21 Paolo Carlini <pcarlini@unitus.it> + + * include/ext/stl_rope.h (_Rope_iterator): + Add local typedef to fix implicit typename problems. + 2001-12-19 Phil Edwards <pme@gcc.gnu.org> * docs/doxygen/Intro.3: New 'Allocators' module. diff --git a/libstdc++-v3/include/ext/stl_rope.h b/libstdc++-v3/include/ext/stl_rope.h index 089561a80bf..b27e7eeee67 100644 --- a/libstdc++-v3/include/ext/stl_rope.h +++ b/libstdc++-v3/include/ext/stl_rope.h @@ -1024,6 +1024,7 @@ template<class _CharT, class _Alloc> class _Rope_iterator : public _Rope_iterator_base<_CharT,_Alloc> { friend class rope<_CharT,_Alloc>; protected: + typedef typename _Rope_iterator_base<_CharT,_Alloc>::_RopeRep _RopeRep; rope<_CharT,_Alloc>* _M_root_rope; // root is treated as a cached version of this, // and is used to detect changes to the underlying @@ -1057,8 +1058,7 @@ class _Rope_iterator : public _Rope_iterator_base<_CharT,_Alloc> { _RopeRep::_S_unref(_M_root); } _Rope_iterator& operator= (const _Rope_iterator& __x) { - typename - _Rope_iterator_base<_CharT,_Alloc>::_RopeRep* __old = _M_root; + _RopeRep* __old = _M_root; _RopeRep::_S_ref(__x._M_root); if (0 != __x._M_buf_ptr) { |
