diff options
| author | Mark Mitchell <mark@codesourcery.com> | 1999-05-01 08:38:50 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 1999-05-01 08:38:50 +0000 |
| commit | 91f2aa2287f1972b07503b5985476675b17bea03 (patch) | |
| tree | ce036dd3130e4eba3ac9640a2baa64fd8e8fab5b | |
| parent | 16b78900fedda54d4045491a3434f4042a6e8384 (diff) | |
| download | gcc-91f2aa2287f1972b07503b5985476675b17bea03.zip gcc-91f2aa2287f1972b07503b5985476675b17bea03.tar.gz gcc-91f2aa2287f1972b07503b5985476675b17bea03.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cde5734..b0f23eb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +1999-05-01 Mark Mitchell <mark@codesourcery.com> + + * decl.c (wrapup_globals_for_namespace): Fix thinko in previous + change. + 1999-04-30 Mark Mitchell <mark@codesourcery.com> * class.c (build_vtable): Use build_lang_decl when building diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index b37dbc8..921fd83 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; |