Fix template lookup.

This commit is contained in:
joerg 2013-03-02 23:23:55 +00:00
parent 642baa00c2
commit 34173e99da
4 changed files with 14 additions and 14 deletions

View File

@ -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;
}

View File

@ -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

View File

@ -708,7 +708,7 @@ protected:
if (_M_data != this->_M_c_string)
this->_M_free_c_string();
__STL_FREE_STRING(_M_data, this->_M_size, this->get_allocator());
this->__STL_FREE_STRING(_M_data, this->_M_size, this->get_allocator());
}
#endif
protected:
@ -1150,7 +1150,7 @@ protected:
operator*()
{
if (0 == this->_M_buf_ptr)
_S_setcache(*this);
this->_S_setcache(*this);
return *this->_M_buf_ptr;
}

View File

@ -382,7 +382,7 @@ 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 _Rope_constants::_S_concat:
@ -391,7 +391,7 @@ 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 _Rope_constants::_S_function:
@ -399,7 +399,7 @@ 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 _Rope_constants::_S_substringfn:
@ -408,7 +408,7 @@ 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;
}
}
@ -513,7 +513,7 @@ namespace __gnu_cxx
}
catch(...)
{
_C_deallocate(__result,1);
rope::_C_deallocate(__result,1);
__throw_exception_again;
}
// In case of exception, we need to deallocate