2019-12-18 Anthony Green <green@moxielogic.com>

[deliverable/binutils-gdb.git] / gdb / cp-valprint.c

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index e73b0e27faf45df222551eb4a443e9a61b6dd30e..0ec84f6799e7d1c7da309b5abf0ef6da7e941951 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -56,7 +56,7 @@ static void cp_print_value (struct type *, struct type *,
 
 
 /* GCC versions after 2.4.5 use this.  */
-extern const char vtbl_ptr_name[] = "__vtbl_ptr_type";
+const char vtbl_ptr_name[] = "__vtbl_ptr_type";
 
 /* Return truth value for assertion that TYPE is of the type
    "pointer to virtual function".  */
@@ -638,9 +638,9 @@ cp_print_static_field (struct type *type,
        {
          if (value_address (val) == first_dont_print[i])
            {
-             fputs_filtered ("<same as static member of an already"
-                             " seen type>",
-                             stream);
+             fputs_styled (_("<same as static member of an already"
+                             " seen type>"),
+                           metadata_style.style (), stream);
              return;
            }
        }
@@ -670,9 +670,9 @@ cp_print_static_field (struct type *type,
        {
          if (target_type == first_dont_print[i])
            {
-             fputs_filtered ("<same as static member of an already"
-                             " seen type>",
-                             stream);
+             fputs_styled (_("<same as static member of an already"
+                             " seen type>"),
+                           metadata_style.style (), stream);
              return;
            }
        }
@@ -740,7 +740,7 @@ void
 cp_print_class_member (const gdb_byte *valaddr, struct type *type,
                       struct ui_file *stream, const char *prefix)
 {
-  enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type));
+  enum bfd_endian byte_order = type_byte_order (type);
 
   /* VAL is a byte offset into the structure type SELF_TYPE.
      Find the name of the field for that offset and