lex.c (handle_cp_pragma): Disable #pragma interface/implementation if MULTIPLE_SYMBOL...

	* lex.c (handle_cp_pragma): Disable #pragma interface/implementation
	if MULTIPLE_SYMBOL_SPACES.

From-SVN: r24104

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dce5cc60594aba154c378f0ff52e235af0abfcb5..8bdd55366a09f31f14257d3d77f951f995a9597c 100644 (file)
--- 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 5d9fc80969f2ef833e81bbe7b80901f4fc510e17..fbd5215c815157ee525cc362142bd3831f798f61 100644 (file)
--- 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;
     }