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/solib-ia64-hpux.c | |
| parent | 3bc3d82a005466a66fa22f704c90f4486ca71344 (diff) | |
| download | fsf-binutils-gdb-fe978cb071b460b2d4aed2f9a71d895f84efce0e.zip fsf-binutils-gdb-fe978cb071b460b2d4aed2f9a71d895f84efce0e.tar.gz fsf-binutils-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/solib-ia64-hpux.c')
| -rw-r--r-- | gdb/solib-ia64-hpux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/solib-ia64-hpux.c b/gdb/solib-ia64-hpux.c index cca6892..3b0bf48 100644 --- a/gdb/solib-ia64-hpux.c +++ b/gdb/solib-ia64-hpux.c @@ -119,7 +119,7 @@ ia64_hpux_at_dld_breakpoint_1_p (ptid_t ptid) struct regcache *regcache = get_thread_regcache (ptid); CORE_ADDR pc = regcache_read_pc (regcache); struct address_space *aspace = get_regcache_aspace (regcache); - ia64_insn t0, t1, slot[3], template, insn; + ia64_insn t0, t1, slot[3], templ, insn; int slotnum; bfd_byte bundle[16]; @@ -139,12 +139,12 @@ ia64_hpux_at_dld_breakpoint_1_p (ptid_t ptid) /* bundles are always in little-endian byte order */ t0 = bfd_getl64 (bundle); t1 = bfd_getl64 (bundle + 8); - template = (t0 >> 1) & 0xf; + templ = (t0 >> 1) & 0xf; slot[0] = (t0 >> 5) & 0x1ffffffffffLL; slot[1] = ((t0 >> 46) & 0x3ffff) | ((t1 & 0x7fffff) << 18); slot[2] = (t1 >> 23) & 0x1ffffffffffLL; - if (template == 2 && slotnum == 1) + if (templ == 2 && slotnum == 1) { /* skip L slot in MLI template: */ slotnum = 2; |