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/testsuite | |
| 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/testsuite')
| -rw-r--r-- | libstdc++-v3/testsuite/util/exception/safety.h | 16 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/util/native_type/native_priority_queue.hpp | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/util/testsuite_io.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libstdc++-v3/testsuite/util/exception/safety.h b/libstdc++-v3/testsuite/util/exception/safety.h index 9468bff..b85f7fe 100644 --- a/libstdc++-v3/testsuite/util/exception/safety.h +++ b/libstdc++-v3/testsuite/util/exception/safety.h @@ -1196,20 +1196,20 @@ namespace __gnu_test // constructor or assignment operator of value_type throws. if (!traits<container_type>::has_throwing_erase::value) { - _M_erasep(_M_container); - _M_eraser(_M_container); + this->_M_erasep(_M_container); + this->_M_eraser(_M_container); } - _M_popf(_M_container); - _M_popb(_M_container); + this->_M_popf(_M_container); + this->_M_popb(_M_container); - _M_iops(_M_container); - _M_ciops(_M_container); + this->_M_iops(_M_container); + this->_M_ciops(_M_container); - _M_swap(_M_container); + this->_M_swap(_M_container); // Last. - _M_clear(_M_container); + this->_M_clear(_M_container); } } }; diff --git a/libstdc++-v3/testsuite/util/native_type/native_priority_queue.hpp b/libstdc++-v3/testsuite/util/native_type/native_priority_queue.hpp index 4367fca..dad913f 100644 --- a/libstdc++-v3/testsuite/util/native_type/native_priority_queue.hpp +++ b/libstdc++-v3/testsuite/util/native_type/native_priority_queue.hpp @@ -188,7 +188,7 @@ namespace __gnu_pbds modify(const_reference r_old, const_reference r_new) { erase(r_old); - push(r_new); + this->push(r_new); } void diff --git a/libstdc++-v3/testsuite/util/testsuite_io.h b/libstdc++-v3/testsuite/util/testsuite_io.h index 681448a..4251b71 100644 --- a/libstdc++-v3/testsuite/util/testsuite_io.h +++ b/libstdc++-v3/testsuite/util/testsuite_io.h @@ -144,7 +144,7 @@ namespace __gnu_test { p[0] = char_type('s'); p[1] = char_type(); - setg(p, p, p + 1); + this->setg(p, p, p + 1); } virtual int_type underflow() |