cp-tree.h (OVL_P): New.
authorNathan Sidwell <nathan@acm.org>
Tue, 23 May 2017 10:58:57 +0000 (10:58 +0000)
committerNathan Sidwell <nathan@gcc.gnu.org>
Tue, 23 May 2017 10:58:57 +0000 (10:58 +0000)
commit9d029ddfdadd3a469a8069ff498a29df8cdb5393
treef7cd3c7126e3fea6faa455d363ecf982e14ca211
parent92fa0f9e09a21f560100dbc1864ed9b576d41d0c
cp-tree.h (OVL_P): New.

gcc/cp
* cp-tree.h (OVL_P): New.
* name-lookup.h (push_local_binding): Delete.
(do_toplevel_using_decl, do_local_using_decl): Rename to ...
(finish_namespace_using_decl, finish_local_using_decl): ... here
* name-lookup.c (add_decl_to_level): Swap args.
(pop_bindings_and_leave_scope): Look inside TREE_LIST.
(diagnose_name_conflict): Check contexts are same for redecl.
(update_local_overload): New.
(compparms_for_decl_and_using): Rename to ...
(matching_fn_p): ... here.
(pushdecl_maybe_friend_1): Adjust add_decl_to_level,
push_local_bindings call.
(push_local_binding): Make static, replace FLAGS arg with
IS_USING.
(validate_nonmember_using_decl): Use OVL_FIRST.
(do_nonmember_using_decl): Use in/out parameters.  Use
lkp_iterator and simplify.
(do_toplevel_using_decl, do_local_using_decl): Rename to ...
(finish_namespace_using_decl, finish_local_using_decl): ... here.
Adjust.
(lookup_type_current_level): Delete.
* parser.c (cp_parser_using_declaration): Adjust.
* pt.c (tsubst_expr): Adjust.

libcc1/
* libcp1plugin.cc (plugin_add_using_decl): Call
finish_namespace_using_decl.  Use assert not unreachable.

gcc/testsuite/
* g++.dg/lookup/using13.C: Adjust expected error.

From-SVN: r248364
gcc/cp/ChangeLog
gcc/cp/cp-tree.h
gcc/cp/name-lookup.c
gcc/cp/name-lookup.h
gcc/cp/parser.c
gcc/cp/pt.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/lookup/using13.C
libcc1/ChangeLog
libcc1/libcp1plugin.cc