Module Name: src
Committed By: joerg
Date: Sat Mar 2 23:23:56 UTC 2013
Modified Files:
src/external/gpl3/gcc/dist/libstdc++-v3/include/ext: rope ropeimpl.h
Log Message:
Fix template lookup.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope
diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope:1.2
--- src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope:1.1.1.1 Tue Jun 21 01:24:44 2011
+++ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope Sat Mar 2 23:23:55 2013
@@ -727,7 +727,7 @@ protected:
if (_M_data != this->_M_c_string)
this->_M_free_c_string();
- __STL_FREE_STRING(_M_data, this->_M_size, this->_M_get_allocator());
+ this->__STL_FREE_STRING(_M_data, this->_M_size, this->_M_get_allocator());
}
#endif
protected:
@@ -1168,7 +1168,7 @@ protected:
operator*()
{
if (0 == this->_M_buf_ptr)
- _S_setcache(*this);
+ this->_S_setcache(*this);
return *this->_M_buf_ptr;
}
Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h
diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.2 src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.3
--- src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.2 Tue Jun 21 06:22:06 2011
+++ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h Sat Mar 2 23:23:56 2013
@@ -378,7 +378,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
_Rope_RopeLeaf<_CharT, _Alloc>* __l
= (_Rope_RopeLeaf<_CharT, _Alloc>*)this;
__l->_Rope_RopeLeaf<_CharT, _Alloc>::~_Rope_RopeLeaf();
- _L_deallocate(__l, 1);
+ this->_L_deallocate(__l, 1);
break;
}
case __detail::_S_concat:
@@ -387,7 +387,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
= (_Rope_RopeConcatenation<_CharT, _Alloc>*)this;
__c->_Rope_RopeConcatenation<_CharT, _Alloc>::
~_Rope_RopeConcatenation();
- _C_deallocate(__c, 1);
+ this->_C_deallocate(__c, 1);
break;
}
case __detail::_S_function:
@@ -395,7 +395,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
_Rope_RopeFunction<_CharT, _Alloc>* __f
= (_Rope_RopeFunction<_CharT, _Alloc>*)this;
__f->_Rope_RopeFunction<_CharT, _Alloc>::~_Rope_RopeFunction();
- _F_deallocate(__f, 1);
+ this->_F_deallocate(__f, 1);
break;
}
case __detail::_S_substringfn:
@@ -404,7 +404,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
(_Rope_RopeSubstring<_CharT, _Alloc>*)this;
__ss->_Rope_RopeSubstring<_CharT, _Alloc>::
~_Rope_RopeSubstring();
- _S_deallocate(__ss, 1);
+ this->_S_deallocate(__ss, 1);
break;
}
}
@@ -509,7 +509,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
}
__catch(...)
{
- _C_deallocate(__result,1);
+ rope::_C_deallocate(__result,1);
__throw_exception_again;
}
// In case of exception, we need to deallocate
