diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 2003-04-03 15:42:16 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 2003-04-03 15:42:16 +0000 |
| commit | de94b46c5c8e451b304c51453d006cf08a343338 (patch) | |
| tree | d3d44863b6742a605d5b7492dbb65562073f1f4c /gcc/cp/decl2.c | |
| parent | 203dcb741cbd8542593607b34f68ce6b6dba83c3 (diff) | |
| download | gcc-de94b46c5c8e451b304c51453d006cf08a343338.zip gcc-de94b46c5c8e451b304c51453d006cf08a343338.tar.gz gcc-de94b46c5c8e451b304c51453d006cf08a343338.tar.bz2 | |
gengtype-lex.l (IWORD): Add CHAR_BITFIELD.
gcc:
* gengtype-lex.l (IWORD): Add CHAR_BITFIELD.
* system.h (CHAR_BITFIELD): New.
cp:
* operators.def (DEF_SIMPLE_OPERATOR, DEF_ASSN_OPERATOR,
DEF_ASSN_OPERATOR): Delete spurious semi-colon.
* rtti.c (dfs_class_hint_mark): Likewise.
* decl.c (push_local_name, push_class_level_binding,
maybe_inject_for_scope_var): Don't use POP_TIMEVAR_AND_RETURN in
functions returning void.
* decl2.c (add_using_namespace): Likewise.
* decl.c (print_binding_level, print_other_binding_stack,
print_binding_stack): Cast argument of %p specifier to void*.
* ptree.c (cxx_print_decl): Likewise.
* cp-tree.h (VAR_OR_FUNCTION_DECL_CHECK,
VAR_FUNCTION_OR_PARM_DECL_CHECK,
VAR_TEMPL_TYPE_OR_FUNCTION_DECL_CHECK, RECORD_OR_UNION_TYPE_CHECK,
BOUND_TEMPLATE_TEMPLATE_PARM_TYPE_CHECK, LANG_TYPE_CLASS_CHECK,
LANG_TYPE_PTRMEM_CHECK, LANG_DECL_U2_CHECK): Add __extension__.
* decl.c (set_current_binding_level): New macro. Use throughout
when setting the current binding level.
* cp-tree.h (cp_lvalue_kind, base_access): Delete trailing comma
in enum.
* method.c (mangling_flags): Likewise.
* cp-tree.h (lang_type_header): Add __extension__ and use
CHAR_BITFIELD for members.
From-SVN: r65201
Diffstat (limited to 'gcc/cp/decl2.c')
| -rw-r--r-- | gcc/cp/decl2.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index b7b0054..0f8617c 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -3457,7 +3457,10 @@ add_using_namespace (tree user, tree used, bool indirect) timevar_push (TV_NAME_LOOKUP); /* Using oneself is a no-op. */ if (user == used) - POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, (void)0); + { + timevar_pop (TV_NAME_LOOKUP); + return; + } my_friendly_assert (TREE_CODE (user) == NAMESPACE_DECL, 380); my_friendly_assert (TREE_CODE (used) == NAMESPACE_DECL, 380); /* Check if we already have this. */ @@ -3467,7 +3470,8 @@ add_using_namespace (tree user, tree used, bool indirect) if (!indirect) /* Promote to direct usage. */ TREE_INDIRECT_USING (t) = 0; - POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, (void)0); + timevar_pop (TV_NAME_LOOKUP); + return; } /* Add used to the user's using list. */ |