Fix the gdb build with GCC 7

[deliverable/binutils-gdb.git] / gdb / objc-lang.c

diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 946a0a1faed286bdec06d929b4cc8dbde97a97b2..e2a6e800b55e8bcf01f2ebd649a919b7a8dba87b 100644 (file)
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -537,8 +537,8 @@ compare_selectors (const void *a, const void *b)
 {
   const char *aname, *bname;
 
-  aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
-  bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
+  aname = (*(struct symbol **) a)->print_name ();
+  bname = (*(struct symbol **) b)->print_name ();
   if (aname == NULL || bname == NULL)
     error (_("internal: compare_selectors(1)"));
 
@@ -610,7 +610,7 @@ info_selectors_command (const char *regexp, int from_tty)
       for (minimal_symbol *msymbol : objfile->msymbols ())
        {
          QUIT;
-         name = MSYMBOL_NATURAL_NAME (msymbol);
+         name = msymbol->natural_name ();
          if (name
              && (name[0] == '-' || name[0] == '+')
              && name[1] == '[')                /* Got a method name.  */
@@ -623,7 +623,7 @@ info_selectors_command (const char *regexp, int from_tty)
              if (name == NULL)
                {
                  complaint (_("Bad method name '%s'"),
-                            MSYMBOL_NATURAL_NAME (msymbol));
+                            msymbol->natural_name ());
                  continue;
                }
              if (regexp == NULL || re_exec(++name) != 0)
@@ -650,7 +650,7 @@ info_selectors_command (const char *regexp, int from_tty)
          for (minimal_symbol *msymbol : objfile->msymbols ())
            {
              QUIT;
-             name = MSYMBOL_NATURAL_NAME (msymbol);
+             name = msymbol->natural_name ();
              if (name &&
                  (name[0] == '-' || name[0] == '+') &&
                  name[1] == '[')               /* Got a method name.  */
@@ -675,7 +675,7 @@ info_selectors_command (const char *regexp, int from_tty)
          char *p = asel;
 
          QUIT;
-         name = SYMBOL_NATURAL_NAME (sym_arr[ix]);
+         name = sym_arr[ix]->natural_name ();
          name = strchr (name, ' ') + 1;
          if (p[0] && specialcmp(name, p) == 0)
            continue;           /* Seen this one already (not unique).  */
@@ -706,8 +706,8 @@ compare_classes (const void *a, const void *b)
 {
   const char *aname, *bname;
 
-  aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
-  bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
+  aname = (*(struct symbol **) a)->print_name ();
+  bname = (*(struct symbol **) b)->print_name ();
   if (aname == NULL || bname == NULL)
     error (_("internal: compare_classes(1)"));
 
@@ -764,7 +764,7 @@ info_classes_command (const char *regexp, int from_tty)
       for (minimal_symbol *msymbol : objfile->msymbols ())
        {
          QUIT;
-         name = MSYMBOL_NATURAL_NAME (msymbol);
+         name = msymbol->natural_name ();
          if (name &&
              (name[0] == '-' || name[0] == '+') &&
              name[1] == '[')                   /* Got a method name.  */
@@ -791,7 +791,7 @@ info_classes_command (const char *regexp, int from_tty)
          for (minimal_symbol *msymbol : objfile->msymbols ())
            {
              QUIT;
-             name = MSYMBOL_NATURAL_NAME (msymbol);
+             name = msymbol->natural_name ();
              if (name &&
                  (name[0] == '-' || name[0] == '+') &&
                  name[1] == '[') /* Got a method name.  */
@@ -809,7 +809,7 @@ info_classes_command (const char *regexp, int from_tty)
          char *p = aclass;
 
          QUIT;
-         name = SYMBOL_NATURAL_NAME (sym_arr[ix]);
+         name = sym_arr[ix]->natural_name ();
          name += 2;
          if (p[0] && specialcmp(name, p) == 0)
            continue;   /* Seen this one already (not unique).  */
@@ -1014,7 +1014,7 @@ find_methods (char type, const char *theclass, const char *category,
 
          /* Check the symbol name first as this can be done entirely without
             sending any query to the target.  */
-         symname = MSYMBOL_NATURAL_NAME (msymbol);
+         symname = msymbol->natural_name ();
          if (symname == NULL)
            continue;
 
@@ -1145,14 +1145,14 @@ find_imps (const char *method, std::vector<const char *> *symbol_names)
                                          0).symbol;
 
       if (sym != NULL) 
-       symbol_names->push_back (SYMBOL_NATURAL_NAME (sym));
+       symbol_names->push_back (sym->natural_name ());
       else
        {
          struct bound_minimal_symbol msym
            = lookup_minimal_symbol (selector, 0, 0);
 
          if (msym.minsym != NULL) 
-           symbol_names->push_back (MSYMBOL_NATURAL_NAME (msym.minsym));
+           symbol_names->push_back (msym.minsym->natural_name ());
        }
     }