Mark discriminants as artificial in gdb.dwarf2/variant.exp

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

diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index 2b3f014253aca950be53ae2bb36d4e9b0820fa3b..3a2100d84cf5a54bb7cf69974b6fa27d4fd5162e 100644 (file)
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -1,5 +1,5 @@
 /* Helper routines for C++ support in GDB.
-   Copyright (C) 2003-2019 Free Software Foundation, Inc.
+   Copyright (C) 2003-2020 Free Software Foundation, Inc.
 
    Contributed by David Carlton and by Kealia, Inc.
 
@@ -516,7 +516,7 @@ cp_lookup_symbol_imports_or_template (const char *scope,
                          domain_name (domain));
     }
 
-  if (function != NULL && SYMBOL_LANGUAGE (function) == language_cplus)
+  if (function != NULL && function->language () == language_cplus)
     {
       /* Search the function's template parameters.  */
       if (SYMBOL_IS_CPLUS_TEMPLATE_FUNCTION (function))
@@ -547,7 +547,6 @@ cp_lookup_symbol_imports_or_template (const char *scope,
          struct type *context;
          std::string name_copy (function->natural_name ());
          const struct language_defn *lang = language_def (language_cplus);
-         struct gdbarch *arch = symbol_arch (function);
          const struct block *parent = BLOCK_SUPERBLOCK (block);
          struct symbol *sym;
 
@@ -561,7 +560,7 @@ cp_lookup_symbol_imports_or_template (const char *scope,
              else
                {
                  name_copy.erase (prefix_len);
-                 context = lookup_typename (lang, arch,
+                 context = lookup_typename (lang,
                                             name_copy.c_str (),
                                             parent, 1);
                }
@@ -1062,8 +1061,9 @@ maintenance_cplus_namespace (const char *args, int from_tty)
   printf_unfiltered (_("The `maint namespace' command was removed.\n"));
 }
 
+void _initialize_cp_namespace ();
 void
-_initialize_cp_namespace (void)
+_initialize_cp_namespace ()
 {
   struct cmd_list_element *cmd;