diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1998-12-04 21:39:25 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-12-04 16:39:25 -0500 |
| commit | 053a61cbeb5a9c6fab543d543c946479d18a6b5b (patch) | |
| tree | 6fcf60de6af7e9010dee458b970b2a0c857ce06c /gcc | |
| parent | 2f38dfa1096333c4d7803b258c0c5f6584b3ff39 (diff) | |
| download | gcc-053a61cbeb5a9c6fab543d543c946479d18a6b5b.zip gcc-053a61cbeb5a9c6fab543d543c946479d18a6b5b.tar.gz gcc-053a61cbeb5a9c6fab543d543c946479d18a6b5b.tar.bz2 | |
lex.c (handle_cp_pragma): Disable #pragma interface/implementation if MULTIPLE_SYMBOL_SPACES.
* lex.c (handle_cp_pragma): Disable #pragma interface/implementation
if MULTIPLE_SYMBOL_SPACES.
From-SVN: r24104
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/lex.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dce5cc6..8bdd553 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 1998-12-04 Jason Merrill <jason@yorick.cygnus.com> + * lex.c (handle_cp_pragma): Disable #pragma interface/implementation + if MULTIPLE_SYMBOL_SPACES. + * pt.c (check_template_shadow): New fn. * decl2.c (grokfield): Use it. * decl.c (pushdecl): Likewise. diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 5d9fc80..fbd5215c 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -4853,7 +4853,7 @@ handle_cp_pragma (pname) if (token != END_OF_LINE) warning ("garbage after `#pragma interface' ignored"); -#ifndef NO_LINKAGE_HEURISTICS +#ifndef MULTIPLE_SYMBOL_SPACES write_virtuals = 3; if (impl_file_chain == 0) @@ -4880,7 +4880,7 @@ handle_cp_pragma (pname) interface_unknown = 0; TREE_INT_CST_LOW (fileinfo) = interface_only; TREE_INT_CST_HIGH (fileinfo) = interface_unknown; -#endif /* NO_LINKAGE_HEURISTICS */ +#endif /* MULTIPLE_SYMBOL_SPACES */ return 1; } @@ -4906,7 +4906,7 @@ handle_cp_pragma (pname) if (token != END_OF_LINE) warning ("garbage after `#pragma implementation' ignored"); -#ifndef NO_LINKAGE_HEURISTICS +#ifndef MULTIPLE_SYMBOL_SPACES if (write_virtuals == 3) { struct impl_files *ifiles = impl_file_chain; @@ -4951,7 +4951,7 @@ handle_cp_pragma (pname) #endif TREE_INT_CST_LOW (fileinfo) = interface_only; TREE_INT_CST_HIGH (fileinfo) = interface_unknown; -#endif /* NO_LINKAGE_HEURISTICS */ +#endif /* MULTIPLE_SYMBOL_SPACES */ return 1; } |