Undo last incorrect change.

From-SVN: r15871

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9fd13bc59f8a526d1a79238c740bfde09de78fb5..1fdd09216c26b02990248e36fbe7dd7f70d7c63e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,8 +1,3 @@
-Tue Oct  7 16:41:20 1997  Manfred Hollstein  (manfred@lts.sel.alcatel.de)
-
-       * cp-tree.h (JOINER): Define to '_' if no '$' or '.' characters
-       are allowed.
-
 Tue Oct  7 00:48:36 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
        * decl.c (duplicate_decls): Don't warn about template instances.

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 8dcd04efd7b36347e0fb996a26784159ad477d60..f91e680a74c5c57177029f483690c0833763cfdf 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1642,8 +1642,6 @@ extern int current_function_parms_stored;
 
 #else /* NO_DOT_IN_LABEL */
 
-#define JOINER '_'
-
 #define VPTR_NAME "__vptr"
 #define VPTR_NAME_P(ID_NODE) \
   (!strncmp (IDENTIFIER_POINTER (ID_NODE), VPTR_NAME, sizeof (VPTR_NAME) - 1))