From fe978cb071b460b2d4aed2f9a71d895f84efce0e Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 27 Feb 2015 16:33:07 +0000 Subject: C++ keyword cleanliness, mostly auto-generated This patch renames symbols that happen to have names which are reserved keywords in C++. Most of this was generated with Tromey's cxx-conversion.el script. Some places where later hand massaged a bit, to fix formatting, etc. And this was rebased several times meanwhile, along with re-running the script, so re-running the script from scratch probably does not result in the exact same output. I don't think that matters anyway. gdb/ 2015-02-27 Tom Tromey Pedro Alves Rename symbols whose names are reserved C++ keywords throughout. gdb/gdbserver/ 2015-02-27 Tom Tromey Pedro Alves Rename symbols whose names are reserved C++ keywords throughout. --- gdb/python/py-symbol.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gdb/python/py-symbol.c') diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index 696935b..729bc64 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -147,42 +147,42 @@ static PyObject * sympy_is_constant (PyObject *self, void *closure) { struct symbol *symbol = NULL; - enum address_class class; + enum address_class theclass; SYMPY_REQUIRE_VALID (self, symbol); - class = SYMBOL_CLASS (symbol); + theclass = SYMBOL_CLASS (symbol); - return PyBool_FromLong (class == LOC_CONST || class == LOC_CONST_BYTES); + return PyBool_FromLong (theclass == LOC_CONST || theclass == LOC_CONST_BYTES); } static PyObject * sympy_is_function (PyObject *self, void *closure) { struct symbol *symbol = NULL; - enum address_class class; + enum address_class theclass; SYMPY_REQUIRE_VALID (self, symbol); - class = SYMBOL_CLASS (symbol); + theclass = SYMBOL_CLASS (symbol); - return PyBool_FromLong (class == LOC_BLOCK); + return PyBool_FromLong (theclass == LOC_BLOCK); } static PyObject * sympy_is_variable (PyObject *self, void *closure) { struct symbol *symbol = NULL; - enum address_class class; + enum address_class theclass; SYMPY_REQUIRE_VALID (self, symbol); - class = SYMBOL_CLASS (symbol); + theclass = SYMBOL_CLASS (symbol); return PyBool_FromLong (!SYMBOL_IS_ARGUMENT (symbol) - && (class == LOC_LOCAL || class == LOC_REGISTER - || class == LOC_STATIC || class == LOC_COMPUTED - || class == LOC_OPTIMIZED_OUT)); + && (theclass == LOC_LOCAL || theclass == LOC_REGISTER + || theclass == LOC_STATIC || theclass == LOC_COMPUTED + || theclass == LOC_OPTIMIZED_OUT)); } /* Implementation of gdb.Symbol.needs_frame -> Boolean. -- cgit v1.1