diff options
| author | David Carlton <carlton@bactrian.org> | 2002-10-11 22:23:08 +0000 |
|---|---|---|
| committer | David Carlton <carlton@bactrian.org> | 2002-10-11 22:23:08 +0000 |
| commit | 25c7cec908f444fb80ac6b5ea3594de13c0a8657 (patch) | |
| tree | f4d9a6c280f498da2187f04b8dadc392f67e7f5c /gdb/cp-valprint.c | |
| parent | 763914f14ca1b05fe07c4160232bee3917f8d506 (diff) | |
| download | gdb-25c7cec908f444fb80ac6b5ea3594de13c0a8657.zip gdb-25c7cec908f444fb80ac6b5ea3594de13c0a8657.tar.gz gdb-25c7cec908f444fb80ac6b5ea3594de13c0a8657.tar.bz2 | |
Merge with mainline; merge tag carlton_dictionary-20021011-merge.
Diffstat (limited to 'gdb/cp-valprint.c')
| -rw-r--r-- | gdb/cp-valprint.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 28dc025..f362d84 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -161,21 +161,13 @@ cp_print_class_method (char *valaddr, } } -/* This was what it was for gcc 2.4.5 and earlier. */ -static const char vtbl_ptr_name_old[] = -{ - CPLUS_MARKER, 'v', 't', 'b', 'l', '_', 'p', 't', 'r', '_', - 't', 'y', 'p', 'e', 0 -}; - -/* It was changed to this after 2.4.5. */ +/* GCC versions after 2.4.5 use this. */ const char vtbl_ptr_name[] = "__vtbl_ptr_type"; -/* HP aCC uses different names */ +/* HP aCC uses different names. */ const char hpacc_vtbl_ptr_name[] = "__vfp"; const char hpacc_vtbl_ptr_type_name[] = "__vftyp"; - /* Return truth value for assertion that TYPE is of the type "pointer to virtual function". */ @@ -184,9 +176,7 @@ cp_is_vtbl_ptr_type (struct type *type) { char *typename = type_name_no_tag (type); - return (typename != NULL - && (STREQ (typename, vtbl_ptr_name) - || STREQ (typename, vtbl_ptr_name_old))); + return (typename != NULL && !strcmp (typename, vtbl_ptr_name)); } /* Return truth value for the assertion that TYPE is of the type |