From: Jim Blandy <jimb@codesourcery.com>
Date: Sat, 24 Mar 2001 03:23:20 +0000 (+0000)
Subject: Revert previous change, committed to trunk accidentally.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2adab5d0b27b20bd56853e9b0c9c6a8763699ae2;p=binutils-gdb.git

Revert previous change, committed to trunk accidentally.
---

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 2cd9e3e3fc1..bdc5a689ee1 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -35,7 +35,6 @@
 #include "demangle.h"
 #include "c-lang.h"
 #include "typeprint.h"
-#include "cp-abi.h"
 
 #include "gdb_string.h"
 #include <errno.h>
@@ -903,10 +902,11 @@ c_type_print_base (struct type *type, struct ui_file *stream, int show,
 		{
 		  char *physname = TYPE_FN_FIELD_PHYSNAME (f, j);
 		  int is_full_physname_constructor =
-		   is_constructor_name (physname) 
-		   || is_destructor_name (physname)
-		   || method_name[0] == '~';
-
+		  ((physname[0] == '_' && physname[1] == '_'
+		    && strchr ("0123456789Qt", physname[2]))
+		   || STREQN (physname, "__ct__", 6)
+		   || DESTRUCTOR_PREFIX_P (physname)
+		   || STREQN (physname, "__dt__", 6));
 
 		  QUIT;
 		  if (TYPE_FN_FIELD_PROTECTED (f, j))