From 5399db93c53472a9b41ce6c8df00791b1ca31247 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Sat, 19 Sep 2020 20:38:11 +0100 Subject: gdb: Rename language_defn::demangle GDB already has a global symbol `demangle` (a boolean), having a language method called `demangle` is not a good idea as we often want to reference `demangle` the control variable inside `demangle` the member function. This commit renames `demangle` the member function to `demangle_symbol`. There should be no user visible changes after this commit. gdb/ChangeLog: * ada-lang.c (ada_language::demangle): Rename to... (ada_language::demangle_symbol): ...this. * c-lang.c (cplus_language::demangle): Rename to... (cplus_language::demangle_symbol): ...this. * d-lang.c (d_language::demangle): Rename to... (d_language::demangle_symbol): ...this. * f-lang.c (f_language::demangle): Rename to... (f_language::demangle_symbol): ...this. * go-lang.c (go_language::demangle): Rename to... (go_language::demangle_symbol): ...this. * language.c (language_demangle): Update call to demangle_symbol. (auto_or_unknown_language::demangle): Rename to... (auto_or_unknown_language::demangle_symbol): ...this. * language.h (language_defn::demangle): Rename to... (language_defn::demangle_symbol): ...this. * objc-lang.c (objc_language::demangle): Rename to... (objc_language::demangle_symbol): ...this. * rust-lang.c (rust_language::demangle): Rename to... (rust_language::demangle_symbol): ...this. --- gdb/language.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gdb/language.c') diff --git a/gdb/language.c b/gdb/language.c index 4053cb7..fe09378 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -589,7 +589,7 @@ language_demangle (const struct language_defn *current_language, const char *mangled, int options) { if (current_language != NULL) - return current_language->demangle (mangled, options); + return current_language->demangle_symbol (mangled, options); return NULL; } @@ -815,7 +815,7 @@ public: /* See language.h. */ - char *demangle (const char *mangled, int options) const override + char *demangle_symbol (const char *mangled, int options) const override { /* The auto language just uses the C++ demangler. */ return gdb_demangle (mangled, options); -- cgit v1.1