aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog2
-rw-r--r--gcc/cp/cp-tree.h8
2 files changed, 2 insertions, 8 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7faf22c..b053298 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -3,6 +3,8 @@
* decl.c (expand_static_init): Call build2 and build3 instead
of build.
+ * cp-tree.h (VPTR_NAME, VPTR_NAME_P): Remove.
+
2005-04-17 Ian Lance Taylor <ian@airs.com>
* cp-tree.def: Add SIZEOF_EXPR, ARROW_EXPR and ALIGNOF_EXPR.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index dd6523f..3765a4b 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3141,7 +3141,6 @@ extern GTY(()) varray_type local_classes;
#define JOINER '$'
-#define VPTR_NAME "$v"
#define THROW_NAME "$eh_throw"
#define AUTO_VTABLE_NAME "__vtbl$me__"
#define AUTO_TEMP_NAME "_$tmp_"
@@ -3160,7 +3159,6 @@ extern GTY(()) varray_type local_classes;
#define JOINER '.'
-#define VPTR_NAME ".v"
#define THROW_NAME ".eh_throw"
#define AUTO_VTABLE_NAME "__vtbl.me__"
#define AUTO_TEMP_NAME "_.tmp_"
@@ -3176,9 +3174,6 @@ extern GTY(()) varray_type local_classes;
#else /* NO_DOT_IN_LABEL */
-#define VPTR_NAME "__vptr"
-#define VPTR_NAME_P(ID_NODE) \
- (!strncmp (IDENTIFIER_POINTER (ID_NODE), VPTR_NAME, sizeof (VPTR_NAME) - 1))
#define THROW_NAME "__eh_throw"
#define IN_CHARGE_NAME "__in_chrg"
#define AUTO_VTABLE_NAME "__vtbl_me__"
@@ -3220,9 +3215,6 @@ extern GTY(()) varray_type local_classes;
#if !defined(NO_DOLLAR_IN_LABEL) || !defined(NO_DOT_IN_LABEL)
-#define VPTR_NAME_P(ID_NODE) (IDENTIFIER_POINTER (ID_NODE)[0] == JOINER \
- && IDENTIFIER_POINTER (ID_NODE)[1] == 'v')
-
#define VTABLE_NAME_P(ID_NODE) (IDENTIFIER_POINTER (ID_NODE)[1] == 'v' \
&& IDENTIFIER_POINTER (ID_NODE)[2] == 't' \
&& IDENTIFIER_POINTER (ID_NODE)[3] == JOINER)