diff options
Diffstat (limited to 'libstdc++-v3/include/ext')
| -rw-r--r-- | libstdc++-v3/include/ext/rope | 46 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/ropeimpl.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/stdio_filebuf.h | 8 |
3 files changed, 29 insertions, 29 deletions
diff --git a/libstdc++-v3/include/ext/rope b/libstdc++-v3/include/ext/rope index 9cb0d68b3ef..e28d0b6e8cc 100644 --- a/libstdc++-v3/include/ext/rope +++ b/libstdc++-v3/include/ext/rope @@ -606,9 +606,9 @@ struct _Rope_RopeLeaf : public _Rope_RopeRep<_CharT,_Alloc> { # ifndef __GC ~_Rope_RopeLeaf() { if (_M_data != this->_M_c_string) { - _M_free_c_string(); + this->_M_free_c_string(); } - __STL_FREE_STRING(_M_data, this->_M_size, get_allocator()); + __STL_FREE_STRING(_M_data, this->_M_size, this->get_allocator()); } # endif }; @@ -632,9 +632,9 @@ struct _Rope_RopeConcatenation : public _Rope_RopeRep<_CharT,_Alloc> { {} # ifndef __GC ~_Rope_RopeConcatenation() { - _M_free_c_string(); - _M_left->_M_unref_nonnil(); - _M_right->_M_unref_nonnil(); + this->_M_free_c_string(); + _M_left->_M_unref_nonnil(); + _M_right->_M_unref_nonnil(); } # endif }; @@ -678,7 +678,7 @@ struct _Rope_RopeFunction : public _Rope_RopeRep<_CharT,_Alloc> { } # ifndef __GC ~_Rope_RopeFunction() { - _M_free_c_string(); + this->_M_free_c_string(); if (_M_delete_when_done) { delete _M_fn; } @@ -979,33 +979,33 @@ class _Rope_const_iterator : public _Rope_iterator_base<_CharT,_Alloc> { this->_M_buf_ptr = __next; ++this->_M_current_pos; } else { - _M_incr(1); + this->_M_incr(1); } return *this; } _Rope_const_iterator& operator+=(ptrdiff_t __n) { if (__n >= 0) { - _M_incr(__n); + this->_M_incr(__n); } else { - _M_decr(-__n); + this->_M_decr(-__n); } return *this; } _Rope_const_iterator& operator--() { - _M_decr(1); + this->_M_decr(1); return *this; } _Rope_const_iterator& operator-=(ptrdiff_t __n) { if (__n >= 0) { - _M_decr(__n); + this->_M_decr(__n); } else { - _M_incr(-__n); + this->_M_incr(-__n); } return *this; } _Rope_const_iterator operator++(int) { size_t __old_pos = this->_M_current_pos; - _M_incr(1); + this->_M_incr(1); return _Rope_const_iterator<_CharT,_Alloc>(this->_M_root, __old_pos); // This makes a subsequent dereference expensive. // Perhaps we should instead copy the iterator @@ -1013,7 +1013,7 @@ class _Rope_const_iterator : public _Rope_iterator_base<_CharT,_Alloc> { } _Rope_const_iterator operator--(int) { size_t __old_pos = this->_M_current_pos; - _M_decr(1); + this->_M_decr(1); return _Rope_const_iterator<_CharT,_Alloc>(this->_M_root, __old_pos); } template<class _CharT2, class _Alloc2> @@ -1112,37 +1112,37 @@ class _Rope_iterator : public _Rope_iterator_base<_CharT,_Alloc> { } } _Rope_iterator& operator++() { - _M_incr(1); + this->_M_incr(1); return *this; } _Rope_iterator& operator+=(ptrdiff_t __n) { if (__n >= 0) { - _M_incr(__n); + this->_M_incr(__n); } else { - _M_decr(-__n); + this->_M_decr(-__n); } return *this; } _Rope_iterator& operator--() { - _M_decr(1); + this->_M_decr(1); return *this; } _Rope_iterator& operator-=(ptrdiff_t __n) { if (__n >= 0) { - _M_decr(__n); + this->_M_decr(__n); } else { - _M_incr(-__n); + this->_M_incr(-__n); } return *this; } _Rope_iterator operator++(int) { size_t __old_pos = this->_M_current_pos; - _M_incr(1); + this->_M_incr(1); return _Rope_iterator<_CharT,_Alloc>(_M_root_rope, __old_pos); } _Rope_iterator operator--(int) { size_t __old_pos = this->_M_current_pos; - _M_decr(1); + this->_M_decr(1); return _Rope_iterator<_CharT,_Alloc>(_M_root_rope, __old_pos); } reference operator[](ptrdiff_t __n) { @@ -1650,7 +1650,7 @@ class rope : public _Rope_base<_CharT,_Alloc> { { _RopeRep* __old = this->_M_tree_ptr; _RopeRep* __left = - __STL_ROPE_FROM_UNOWNED_CHAR_PTR(&__x, 1, get_allocator()); + __STL_ROPE_FROM_UNOWNED_CHAR_PTR(&__x, 1, this->get_allocator()); try { this->_M_tree_ptr = _S_concat(__left, this->_M_tree_ptr); _S_unref(__old); diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h index 104b640989c..3c8b8673597 100644 --- a/libstdc++-v3/include/ext/ropeimpl.h +++ b/libstdc++-v3/include/ext/ropeimpl.h @@ -1455,7 +1455,7 @@ const _CharT* rope<_CharT,_Alloc>::c_str() const { if (0 == __result) { size_t __s = size(); - __result = _Data_allocate(__s + 1); + __result = this->_Data_allocate(__s + 1); _S_flatten(this->_M_tree_ptr, __result); __result[__s] = _S_eos((_CharT*)0); this->_M_tree_ptr->_M_c_string = __result; @@ -1480,7 +1480,7 @@ const _CharT* rope<_CharT,_Alloc>::replace_with_c_str() { _S_flatten(this->_M_tree_ptr, __result); __result[__s] = _S_eos((_CharT*)0); this->_M_tree_ptr->_M_unref_nonnil(); - this->_M_tree_ptr = _S_new_RopeLeaf(__result, __s, get_allocator()); + this->_M_tree_ptr = _S_new_RopeLeaf(__result, __s, this->get_allocator()); return(__result); } diff --git a/libstdc++-v3/include/ext/stdio_filebuf.h b/libstdc++-v3/include/ext/stdio_filebuf.h index 574a62b8160..8750f5801e3 100644 --- a/libstdc++-v3/include/ext/stdio_filebuf.h +++ b/libstdc++-v3/include/ext/stdio_filebuf.h @@ -126,10 +126,10 @@ namespace __gnu_cxx { this->_M_mode = __mode; this->_M_buf_size = __size; - _M_allocate_internal_buffer(); + this->_M_allocate_internal_buffer(); this->_M_reading = false; this->_M_writing = false; - _M_set_buffer(-1); + this->_M_set_buffer(-1); } } @@ -143,10 +143,10 @@ namespace __gnu_cxx { this->_M_mode = __mode; this->_M_buf_size = __size; - _M_allocate_internal_buffer(); + this->_M_allocate_internal_buffer(); this->_M_reading = false; this->_M_writing = false; - _M_set_buffer(-1); + this->_M_set_buffer(-1); } } } // namespace __gnu_cxx |
