diff options
| author | Volker Reichelt <reichelt@igpm.rwth-aachen.de> | 2006-01-25 15:12:04 +0000 |
|---|---|---|
| committer | Volker Reichelt <reichelt@igpm.rwth-aachen.de> | 2006-01-25 15:12:04 +0000 |
| commit | 199efc8796aa88611a02f9d9a8f6163f4063ee14 (patch) | |
| tree | a4ced4cf36358d8fa1b5702a0294429776fd86e5 /gcc | |
| parent | 918e87734882b35fcfbe352c034386f4545e8a15 (diff) | |
Revert:
* cp-tree.h (do_poplevel): Remove prototype.
* semantics.c (do_poplevel): Add prototype. Make static.
Revert:
* cp-tree.h (default_conversion): Remove prototype.
* typeck.c (default_conversion): Make static.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@110214 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 3 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a4f2fab7e0e..9dea52e097b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,15 @@ 2006-01-25 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + Revert: + * cp-tree.h (do_poplevel): Remove prototype. + * semantics.c (do_poplevel): Add prototype. Make static. + + Revert: + * cp-tree.h (default_conversion): Remove prototype. + * typeck.c (default_conversion): Make static. + +2006-01-25 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + * cp-tree.h (get_primary_binfo): Remove prototype. (push_using_decl): Likewise. (current_template_args): Likewise. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index e7394075b24..93453feacff 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -4125,6 +4125,7 @@ extern void perform_deferred_access_checks (void); extern void perform_or_defer_access_check (tree, tree); extern int stmts_are_full_exprs_p (void); extern void init_cp_semantics (void); +extern tree do_poplevel (tree); extern void add_decl_expr (tree); extern tree finish_expr_stmt (tree); extern tree begin_if_stmt (void); @@ -4304,6 +4305,7 @@ extern tree cxx_sizeof_or_alignof_type (tree, enum tree_code, bool); #define cxx_sizeof_nowarn(T) cxx_sizeof_or_alignof_type (T, SIZEOF_EXPR, false) extern tree inline_conversion (tree); extern tree decay_conversion (tree); +extern tree default_conversion (tree); extern tree build_class_member_access_expr (tree, tree, tree, bool); extern tree finish_class_member_access_expr (tree, tree, bool); extern tree build_x_indirect_ref (tree, const char *); diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 4ff4e2610e0..82218995774 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -53,7 +53,6 @@ during template instantiation, which may be regarded as a degenerate form of parsing. */ -static tree do_poplevel (tree); static tree maybe_convert_cond (tree); static tree simplify_aggr_init_exprs_r (tree *, int *, void *); static void emit_associated_thunks (tree); @@ -424,7 +423,7 @@ anon_aggr_type_p (tree node) /* Finish a scope. */ -static tree +tree do_poplevel (tree stmt_list) { tree block = NULL; diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 792b919a9aa..6d7c1277414 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -1423,7 +1423,7 @@ decay_conversion (tree exp) return exp; } -static tree +tree default_conversion (tree exp) { exp = decay_conversion (exp); |