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/macrotab.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gdb/macrotab.c') diff --git a/gdb/macrotab.c b/gdb/macrotab.c index 4c50e66c687..4c5341ea98c 100644 --- a/gdb/macrotab.c +++ b/gdb/macrotab.c @@ -450,7 +450,7 @@ macro_include (struct macro_source_file *source, int line, const char *included) { - struct macro_source_file *new; + struct macro_source_file *newobj; struct macro_source_file **link; /* Find the right position in SOURCE's `includes' list for the new @@ -496,13 +496,13 @@ macro_include (struct macro_source_file *source, /* At this point, we know that LINE is an unused line number, and *LINK points to the entry an #inclusion at that line should precede. */ - new = new_source_file (source->table, included); - new->included_by = source; - new->included_at_line = line; - new->next_included = *link; - *link = new; + newobj = new_source_file (source->table, included); + newobj->included_by = source; + newobj->included_at_line = line; + newobj->next_included = *link; + *link = newobj; - return new; + return newobj; } -- cgit v1.2.1