cp-tree.h (FORMAT_VBASE_NAME): Make definition unconditional.

�
	* cp-tree.h (FORMAT_VBASE_NAME): Make definition unconditional.

From-SVN: r23340

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4a22f1ec2b7114a338ec7e94c8832cfa9daba7b0..0501bcae821b7a39b8ae3d3d377faca16d52881f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1998-10-26  Manfred Hollstein  <manfred@s-direktnet.de>
+
+       * cp-tree.h (FORMAT_VBASE_NAME): Make definition unconditional.
+
 1998-10-26  Jason Merrill  <jason@yorick.cygnus.com>
 
        * typeck.c (convert_arguments): Don't handle pmf references 

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 7ef0477f5b84640b188924cb3540c3fdf42d8940..025ae86d62855ee26e56de66f4b99b62a02c20dc 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -2209,13 +2209,6 @@ extern int current_function_parms_stored;
   && IDENTIFIER_POINTER (ID_NODE)[2] == 'b' \
   && IDENTIFIER_POINTER (ID_NODE)[3] == JOINER)
 
-/* Store the vbase pointer field name for type TYPE into pointer BUF.  */
-#define FORMAT_VBASE_NAME(BUF,TYPE) do {                               \
-  BUF = (char *) alloca (TYPE_ASSEMBLER_NAME_LENGTH (TYPE)             \
-                        + sizeof (VBASE_NAME) + 1);                    \
-  sprintf (BUF, VBASE_NAME_FORMAT, TYPE_ASSEMBLER_NAME_STRING (TYPE)); \
-} while (0)
-
 #define TEMP_NAME_P(ID_NODE) (!strncmp (IDENTIFIER_POINTER (ID_NODE), AUTO_TEMP_NAME, sizeof (AUTO_TEMP_NAME)-1))
 #define VFIELD_NAME_P(ID_NODE) (!strncmp (IDENTIFIER_POINTER (ID_NODE), VFIELD_NAME, sizeof(VFIELD_NAME)-1))
 
@@ -2229,6 +2222,13 @@ extern int current_function_parms_stored;
                                  && IDENTIFIER_POINTER (ID_NODE)[1] <= '9')
 #endif /* !defined(NO_DOLLAR_IN_LABEL) || !defined(NO_DOT_IN_LABEL) */
 
+/* Store the vbase pointer field name for type TYPE into pointer BUF.  */
+#define FORMAT_VBASE_NAME(BUF,TYPE) do {                               \
+  BUF = (char *) alloca (TYPE_ASSEMBLER_NAME_LENGTH (TYPE)             \
+                        + sizeof (VBASE_NAME) + 1);                    \
+  sprintf (BUF, VBASE_NAME_FORMAT, TYPE_ASSEMBLER_NAME_STRING (TYPE)); \
+} while (0)
+
 /* Returns non-zero iff ID_NODE is an IDENTIFIER_NODE whose name is
    `main'.  */
 #define MAIN_NAME_P(ID_NODE) \