From 8f341c15fde2c92f7752225422f50379060ad64d Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Thu, 30 Sep 1993 16:43:35 +0000 Subject: * cp-valprint.c (cp_is_vtbl_ptr_type): Continue to accept old form. --- gdb/cp-valprint.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gdb/cp-valprint.c') diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index d43eb52..47b38f8 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -167,14 +167,16 @@ cp_is_vtbl_ptr_type(type) struct type *type; { char *typename = type_name_no_tag (type); -/* WAS this and from 4.10, it changed to __vtbl_ptr_type ** - static const char vtbl_ptr_name[] = + /* 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. */ static const char vtbl_ptr_name[] = { '_','_','v','t','b','l','_','p','t','r','_','t','y','p','e', 0 }; - return (typename != NULL && STREQ(typename, vtbl_ptr_name)); + return (typename != NULL + && (STREQ (typename, vtbl_ptr_name) + || STREQ (typename, vtbl_ptr_name_old))); } /* Return truth value for the assertion that TYPE is of the type -- cgit v1.1