diff options
| author | Jason Merrill <jason@redhat.com> | 2011-05-20 14:01:22 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-05-20 14:01:22 -0400 |
| commit | 94df301fa033641561145d44ed48cf4c85d43a2c (patch) | |
| tree | a133483f2142f1c02de48fd4af4865636ad9ed75 /libstdc++-v3/include/ext/rc_string_base.h | |
| parent | 6e04dcd56f7d94288467234f065fca6006761cfe (diff) | |
| download | gcc-94df301fa033641561145d44ed48cf4c85d43a2c.zip gcc-94df301fa033641561145d44ed48cf4c85d43a2c.tar.gz gcc-94df301fa033641561145d44ed48cf4c85d43a2c.tar.bz2 | |
re PR c++/24163 (dependent Base class scope examined during unqualified name lookup in template)
PR c++/24163
PR c++/29131
gcc/cp/
* pt.c (tsubst_copy_and_build) [CALL_EXPR]: Avoid repeating
unqualified lookup.
* semantics.c (perform_koenig_lookup): Add complain parm.
* cp-tree.h: Adjust.
* parser.c (cp_parser_postfix_expression): Adjust.
(cp_parser_perform_range_for_lookup): Adjust.
libstdc++-v3/
* include/ext/pb_ds/assoc_container.hpp: Explicitly qualify calls to
functions from dependent bases.
* include/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp: Likewise.
* include/ext/pb_ds/detail/rb_tree_map_/
split_join_fn_imps.hpp: Likewise.
* include/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp: Likewise.
* include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp: Likewise.
* include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp: Likewise.
* include/ext/pb_ds/detail/splay_tree_/
split_join_fn_imps.hpp: Likewise.
* include/ext/pb_ds/detail/tree_policy/
order_statistics_imp.hpp: Likewise.
* include/ext/pb_ds/detail/trie_policy/
prefix_search_node_update_imp.hpp: Likewise.
* include/ext/rc_string_base.h: Likewise.
* include/ext/rope: Likewise.
* include/ext/ropeimpl.h: Likewise.
* testsuite/util/exception/safety.h: Likewise.
* testsuite/util/native_type/native_priority_queue.hpp: Likewise.
* testsuite/util/testsuite_io.h: Likewise.
* include/std/functional: Declare mem_fn earlier.
* include/tr1/functional: Likewise.
* include/tr1/exp_integral.tcc: Declare __expint_E1 earlier.
From-SVN: r173965
Diffstat (limited to 'libstdc++-v3/include/ext/rc_string_base.h')
| -rw-r--r-- | libstdc++-v3/include/ext/rc_string_base.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libstdc++-v3/include/ext/rc_string_base.h b/libstdc++-v3/include/ext/rc_string_base.h index 4a27ff6..afd4d9e 100644 --- a/libstdc++-v3/include/ext/rc_string_base.h +++ b/libstdc++-v3/include/ext/rc_string_base.h @@ -461,7 +461,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __alloc); if (_M_info._M_length) - _S_copy(__r->_M_refdata(), _M_refdata(), _M_info._M_length); + __rc_string_base::_S_copy(__r->_M_refdata(), _M_refdata(), _M_info._M_length); __r->_M_set_length(_M_info._M_length); return __r->_M_refdata(); @@ -569,7 +569,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Check for out_of_range and length_error exceptions. _Rep* __r = _Rep::_S_create(__dnew, size_type(0), __a); __try - { _S_copy_chars(__r->_M_refdata(), __beg, __end); } + { __rc_string_base::_S_copy_chars(__r->_M_refdata(), __beg, __end); } __catch(...) { __r->_M_destroy(__a); @@ -590,7 +590,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Check for out_of_range and length_error exceptions. _Rep* __r = _Rep::_S_create(__n, size_type(0), __a); if (__n) - _S_assign(__r->_M_refdata(), __n, __c); + __rc_string_base::_S_assign(__r->_M_refdata(), __n, __c); __r->_M_set_length(__n); return __r->_M_refdata(); @@ -659,11 +659,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_capacity(), _M_get_allocator()); if (__pos) - _S_copy(__r->_M_refdata(), _M_data(), __pos); + this->_S_copy(__r->_M_refdata(), _M_data(), __pos); if (__s && __len2) - _S_copy(__r->_M_refdata() + __pos, __s, __len2); + this->_S_copy(__r->_M_refdata() + __pos, __s, __len2); if (__how_much) - _S_copy(__r->_M_refdata() + __pos + __len2, + this->_S_copy(__r->_M_refdata() + __pos + __len2, _M_data() + __pos + __len1, __how_much); _M_dispose(); @@ -685,9 +685,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_get_allocator()); if (__pos) - _S_copy(__r->_M_refdata(), _M_data(), __pos); + this->_S_copy(__r->_M_refdata(), _M_data(), __pos); if (__how_much) - _S_copy(__r->_M_refdata() + __pos, + this->_S_copy(__r->_M_refdata() + __pos, _M_data() + __pos + __n, __how_much); _M_dispose(); @@ -696,7 +696,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION else if (__how_much && __n) { // Work in-place. - _S_move(_M_data() + __pos, + this->_S_move(_M_data() + __pos, _M_data() + __pos + __n, __how_much); } |