aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@unitus.it>2001-12-21 14:08:35 +0100
committerPaolo Carlini <paolo@gcc.gnu.org>2001-12-21 13:08:35 +0000
commit05b858114687472addab0f8d327ba78f2bfde839 (patch)
tree5bfb4713076900d4d070a32bc530741bc31c931d
parentea1c1719bf72ada3bc8074909c0f7aa22797ba8e (diff)
downloadgcc-05b858114687472addab0f8d327ba78f2bfde839.zip
gcc-05b858114687472addab0f8d327ba78f2bfde839.tar.gz
gcc-05b858114687472addab0f8d327ba78f2bfde839.tar.bz2
stl_rope.h (_Rope_iterator): Add local typedef to fix implicit typename problems.
2001-12-21 Paolo Carlini <pcarlini@unitus.it> * include/ext/stl_rope.h (_Rope_iterator): Add local typedef to fix implicit typename problems. From-SVN: r48242
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/ext/stl_rope.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ee88500..df541cd 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 089561a..b27e7ee 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) {