diff options
| author | reichelt <reichelt@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-13 22:32:47 +0000 |
|---|---|---|
| committer | reichelt <reichelt@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-13 22:32:47 +0000 |
| commit | 66b60ad2ebb53f55f864396f3165796d1f4777f0 (patch) | |
| tree | 3693411bab7912c05d88df9e839c2cc4d00a9278 | |
| parent | aed62d2b3c79cdb84d7e61c17ad7d39e2da6bff6 (diff) | |
| download | gcc-66b60ad2ebb53f55f864396f3165796d1f4777f0.tar.gz | |
* cp-tree.h (push_tinst_level): Remove prototype.
(pop_tinst_level): Likewise.
* pt.c (push_tinst_level): Add prototype, make static.
(pop_tinst_level): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110934 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eac70313bfe..9852864959e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,12 @@ 2006-02-13 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + * cp-tree.h (push_tinst_level): Remove prototype. + (pop_tinst_level): Likewise. + * pt.c (push_tinst_level): Add prototype, make static. + (pop_tinst_level): Likewise. + +2006-02-13 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + * decl.c (grokdeclarator): Return NULL_TREE instead of 0. * typeck.c (unary_complex_lvalue): Likewise. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index dfeb4122db2..aa6876aef8e 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -4022,8 +4022,6 @@ extern int more_specialized_fn (tree, tree, int); extern void do_decl_instantiation (tree, tree); extern void do_type_instantiation (tree, tree, tsubst_flags_t); extern tree instantiate_decl (tree, int, bool); -extern int push_tinst_level (tree); -extern void pop_tinst_level (void); extern int comp_template_parms (tree, tree); extern int template_class_depth (tree); extern int is_specialization_of (tree, tree); diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index bf6923f3ae1..c113f41b285 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -97,6 +97,8 @@ static int try_one_overload (tree, tree, tree, tree, tree, unification_kind_t, int, bool); static int unify (tree, tree, tree, tree, int); static void add_pending_template (tree); +static int push_tinst_level (tree); +static void pop_tinst_level (void); static void reopen_tinst_level (tree); static tree classtype_mangled_name (tree); static char* mangle_class_name_for_template (const char *, tree, tree); @@ -5046,7 +5048,7 @@ static int last_template_error_tick; /* We're starting to instantiate D; record the template instantiation context for diagnostics and to restore it later. */ -int +static int push_tinst_level (tree d) { tree new; @@ -5089,7 +5091,7 @@ push_tinst_level (tree d) /* We're done instantiating this template; return to the instantiation context. */ -void +static void pop_tinst_level (void) { tree old = current_tinst_level; |