diff options
| author | Mike Stump <mrs@gcc.gnu.org> | 1995-12-19 06:51:14 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 1995-12-19 06:51:14 +0000 |
| commit | 72b7eeff72ff8775207e3708511d808cbe94ef3d (patch) | |
| tree | 44f132baadba7e87b171112daeea334c32f37dc2 /gcc/cp/pt.c | |
| parent | f82da7d270d2bf27905b338f28622c3546ad9306 (diff) | |
| download | gcc-72b7eeff72ff8775207e3708511d808cbe94ef3d.zip gcc-72b7eeff72ff8775207e3708511d808cbe94ef3d.tar.gz gcc-72b7eeff72ff8775207e3708511d808cbe94ef3d.tar.bz2 | |
76th Cygnus<->FSF merge
From-SVN: r10815
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 3ce0224..b80bff0 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -2400,7 +2400,7 @@ do_pending_expansions () if (i->interface == 1) /* OK, it was an implicit instantiation. */ { - if (SUPPORTS_WEAK) + if (flag_weak) DECL_WEAK (t) = 1; else TREE_PUBLIC (t) = 0; @@ -2533,6 +2533,8 @@ do_function_instantiation (declspecs, declarator, storage) fn = IDENTIFIER_GLOBAL_VALUE (name), fn && DECL_TEMPLATE_INSTANTIATION (fn)) result = fn; + else if (fn && DECL_CONTEXT (fn)) + ; else if (name = DECL_NAME (decl), fn = IDENTIFIER_GLOBAL_VALUE (name), fn) { for (fn = get_first_fn (fn); fn; fn = DECL_CHAIN (fn)) |