diff options
| author | Pedro Alves <palves@redhat.com> | 2015-02-27 16:33:07 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-02-27 16:33:07 +0000 |
| commit | fe978cb071b460b2d4aed2f9a71d895f84efce0e (patch) | |
| tree | 65d107663745fc7872e680feea9ec2fa6a4949ad /gdb/minsyms.c | |
| parent | 3bc3d82a005466a66fa22f704c90f4486ca71344 (diff) | |
| download | gdb-fe978cb071b460b2d4aed2f9a71d895f84efce0e.zip gdb-fe978cb071b460b2d4aed2f9a71d895f84efce0e.tar.gz gdb-fe978cb071b460b2d4aed2f9a71d895f84efce0e.tar.bz2 | |
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 <tromey@redhat.com>
Pedro Alves <palves@redhat.com>
Rename symbols whose names are reserved C++ keywords throughout.
gdb/gdbserver/
2015-02-27 Tom Tromey <tromey@redhat.com>
Pedro Alves <palves@redhat.com>
Rename symbols whose names are reserved C++ keywords throughout.
Diffstat (limited to 'gdb/minsyms.c')
| -rw-r--r-- | gdb/minsyms.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gdb/minsyms.c b/gdb/minsyms.c index 83b2070..f8985e8 100644 --- a/gdb/minsyms.c +++ b/gdb/minsyms.c @@ -550,7 +550,7 @@ lookup_minimal_symbol_by_pc_section_1 (CORE_ADDR pc_in, { int lo; int hi; - int new; + int newobj; struct objfile *objfile; struct minimal_symbol *msymbol; struct minimal_symbol *best_symbol = NULL; @@ -617,15 +617,15 @@ lookup_minimal_symbol_by_pc_section_1 (CORE_ADDR pc_in, { /* pc is still strictly less than highest address. */ /* Note "new" will always be >= lo. */ - new = (lo + hi) / 2; - if ((MSYMBOL_VALUE_RAW_ADDRESS (&msymbol[new]) >= pc) - || (lo == new)) + newobj = (lo + hi) / 2; + if ((MSYMBOL_VALUE_RAW_ADDRESS (&msymbol[newobj]) >= pc) + || (lo == newobj)) { - hi = new; + hi = newobj; } else { - lo = new; + lo = newobj; } } @@ -975,7 +975,7 @@ prim_record_minimal_symbol_full (const char *name, int name_len, int copy_name, struct objfile *objfile) { struct obj_section *obj_section; - struct msym_bunch *new; + struct msym_bunch *newobj; struct minimal_symbol *msymbol; /* Don't put gcc_compiled, __gnu_compiled_cplus, and friends into @@ -1001,10 +1001,10 @@ prim_record_minimal_symbol_full (const char *name, int name_len, int copy_name, if (msym_bunch_index == BUNCH_SIZE) { - new = XCNEW (struct msym_bunch); + newobj = XCNEW (struct msym_bunch); msym_bunch_index = 0; - new->next = msym_bunch; - msym_bunch = new; + newobj->next = msym_bunch; + msym_bunch = newobj; } msymbol = &msym_bunch->contents[msym_bunch_index]; MSYMBOL_SET_LANGUAGE (msymbol, language_auto, |