diff options
| author | joerg <joerg@NetBSD.org> | 2013-03-02 23:23:55 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2013-03-02 23:23:55 +0000 |
| commit | 8a0afff8c76cbfb0afd0bae13f16682f8559130e (patch) | |
| tree | 9931c014275c4f288147d0166d3bdb63e0ae7acb /gnu | |
| parent | e0f58635da4f04971dbc4e623d2f136d885e6499 (diff) | |
Fix template lookup.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/dist/gcc4/libstdc++-v3/include/ext/rope | 4 | ||||
| -rw-r--r-- | gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gnu/dist/gcc4/libstdc++-v3/include/ext/rope b/gnu/dist/gcc4/libstdc++-v3/include/ext/rope index e4ad50de62f..291b833659e 100644 --- a/gnu/dist/gcc4/libstdc++-v3/include/ext/rope +++ b/gnu/dist/gcc4/libstdc++-v3/include/ext/rope @@ -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; } diff --git a/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h b/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h index 9b16b6bb83d..238eb7ec2d3 100644 --- a/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h +++ b/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h @@ -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 |
