From 9173cf24ee4e2dea97a1d0c94ddc30f8cd8d4e3a Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Thu, 28 Mar 2013 13:48:56 +0000 Subject: [PATCH] cp-tree.h (next_aggr_init_expr_arg): Remove static specifier. * cp-tree.h (next_aggr_init_expr_arg): Remove static specifier. (first_aggr_init_expr): Likewise. (more_aggr_init_expr_args_p): Likewise. (type_of_this_parm): Likewise. (class_of_this_parm): Likewise. * name-lookup.h (get_global_value_if_present): Likewise. (is_typename_at_global_scope): Likewise. From-SVN: r197196 --- gcc/cp/ChangeLog | 10 ++++++++++ gcc/cp/cp-tree.h | 12 ++++++------ gcc/cp/name-lookup.h | 4 ++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 40b83ded179..f4952838fdb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,13 @@ +2013-03-28 Gabriel Dos Reis + + * cp-tree.h (next_aggr_init_expr_arg): Remove static specifier. + (first_aggr_init_expr): Likewise. + (more_aggr_init_expr_args_p): Likewise. + (type_of_this_parm): Likewise. + (class_of_this_parm): Likewise. + * name-lookup.h (get_global_value_if_present): Likewise. + (is_typename_at_global_scope): Likewise. + 2013-03-28 Paolo Carlini * call.c (joust): Don't call inform for a permerror returning false. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 36671d5c3a3..e8e40ec4e05 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3026,7 +3026,7 @@ typedef struct aggr_init_expr_arg_iterator_d { /* Initialize the abstract argument list iterator object ITER with the arguments from AGGR_INIT_EXPR node EXP. */ -static inline void +inline void init_aggr_init_expr_arg_iterator (tree exp, aggr_init_expr_arg_iterator *iter) { @@ -3037,7 +3037,7 @@ init_aggr_init_expr_arg_iterator (tree exp, /* Return the next argument from abstract argument list iterator object ITER, and advance its state. Return NULL_TREE if there are no more arguments. */ -static inline tree +inline tree next_aggr_init_expr_arg (aggr_init_expr_arg_iterator *iter) { tree result; @@ -3052,7 +3052,7 @@ next_aggr_init_expr_arg (aggr_init_expr_arg_iterator *iter) past and return the first argument. Useful in for expressions, e.g. for (arg = first_aggr_init_expr_arg (exp, &iter); arg; arg = next_aggr_init_expr_arg (&iter)) */ -static inline tree +inline tree first_aggr_init_expr_arg (tree exp, aggr_init_expr_arg_iterator *iter) { init_aggr_init_expr_arg_iterator (exp, iter); @@ -3061,7 +3061,7 @@ first_aggr_init_expr_arg (tree exp, aggr_init_expr_arg_iterator *iter) /* Test whether there are more arguments in abstract argument list iterator ITER, without changing its state. */ -static inline bool +inline bool more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter) { return (iter->i < iter->n); @@ -4905,7 +4905,7 @@ bool decl_spec_seq_has_spec_p (const cp_decl_specifier_seq *, cp_decl_spec); /* Return the type of the `this' parameter of FNTYPE. */ -static inline tree +inline tree type_of_this_parm (const_tree fntype) { function_args_iterator iter; @@ -4916,7 +4916,7 @@ type_of_this_parm (const_tree fntype) /* Return the class of the `this' parameter of FNTYPE. */ -static inline tree +inline tree class_of_this_parm (const_tree fntype) { return TREE_TYPE (type_of_this_parm (fntype)); diff --git a/gcc/cp/name-lookup.h b/gcc/cp/name-lookup.h index b88ada37c96..11cdd1f09e8 100644 --- a/gcc/cp/name-lookup.h +++ b/gcc/cp/name-lookup.h @@ -347,7 +347,7 @@ extern void cp_emit_debug_info_for_using (tree, tree); /* Set *DECL to the (non-hidden) declaration for ID at global scope, if present and return true; otherwise return false. */ -static inline bool +inline bool get_global_value_if_present (tree id, tree *decl) { tree global_value = namespace_binding (id, global_namespace); @@ -358,7 +358,7 @@ get_global_value_if_present (tree id, tree *decl) /* True is the binding of IDENTIFIER at global scope names a type. */ -static inline bool +inline bool is_typename_at_global_scope (tree id) { tree global_value = namespace_binding (id, global_namespace); -- 2.30.2