From 91f2aa2287f1972b07503b5985476675b17bea03 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Sat, 1 May 1999 08:38:50 +0000 Subject: [PATCH] decl.c (wrapup_globals_for_namespace): Fix thinko in previous change. * decl.c (wrapup_globals_for_namespace): Fix thinko in previous change. From-SVN: r26716 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cde57345880..b0f23ebfbd0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +1999-05-01 Mark Mitchell + + * decl.c (wrapup_globals_for_namespace): Fix thinko in previous + change. + 1999-04-30 Mark Mitchell * class.c (build_vtable): Use build_lang_decl when building diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index b37dbc8e6bc..921fd8322ee 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2012,7 +2012,7 @@ wrapup_globals_for_namespace (namespace, data) wrapup_global_declarations from writing them out; we must process them ourselves in finish_vtable_vardecl. */ for (i = 0; i < len; ++i) - if (vtable_decl_p (vec[i], /*data=*/0)) + if (vtable_decl_p (vec[i], /*data=*/0) && !DECL_EXTERNAL (vec[i])) { DECL_NOT_REALLY_EXTERN (vec[i]) = 1; DECL_EXTERNAL (vec[i]) = 1; -- 2.30.2