* gdb.c++/psmang.exp: Doc fix.

[deliverable/binutils-gdb.git] / gdb / jv-typeprint.c

diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index 4fdd84c2fbeb43fe73a559d0b159f931c056d93c..893082cc187ebb9e7498024cc670c2bad7c60768 100644 (file)
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -28,6 +28,7 @@
 #include "gdb_string.h"
 #include "typeprint.h"
 #include "c-lang.h"
+#include "cp-abi.h"
 
 /* Local functions */
 
@@ -151,7 +152,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
          fprintf_filtered (stream, "{\n");
          if ((TYPE_NFIELDS (type) == 0) && (TYPE_NFN_FIELDS (type) == 0))
            {
-             if (TYPE_FLAGS (type) & TYPE_FLAG_STUB)
+             if (TYPE_STUB (type))
                fprintfi_filtered (level + 4, stream, "<incomplete type>\n");
              else
                fprintfi_filtered (level + 4, stream, "<no data fields>\n");
@@ -224,12 +225,9 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
 
                  physname = TYPE_FN_FIELD_PHYSNAME (f, j);
 
-                 is_full_physname_constructor =
-                   ((physname[0] == '_' && physname[1] == '_'
-                     && strchr ("0123456789Qt", physname[2]))
-                    || STREQN (physname, "__ct__", 6)
-                    || DESTRUCTOR_PREFIX_P (physname)
-                    || STREQN (physname, "__dt__", 6));
+                 is_full_physname_constructor
+                    = (is_constructor_name (physname)
+                       || is_destructor_name (physname));
 
                  QUIT;