From f8740dc531c006311ee9f7287180550fe46a94ab Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 5 Oct 2018 07:28:16 -0600 Subject: [PATCH] Fix -Wshadow=local warning in sol_thread_target::wait Rainer pointed out that -Wshadow=local broke the Solaris build. This fixes it. gdb/ChangeLog 2018-10-05 Tom Tromey * sol-thread.c (sol_thread_target::wait): Rename inner "save_ptid". --- gdb/ChangeLog | 5 +++++ gdb/sol-thread.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 912bdecfb2..a533ffdba2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-10-05 Tom Tromey + + * sol-thread.c (sol_thread_target::wait): Rename inner + "save_ptid". + 2018-10-04 Tom Tromey * configure: Rebuild. diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c index 5cdc9a8c1e..682302a40b 100644 --- a/gdb/sol-thread.c +++ b/gdb/sol-thread.c @@ -440,14 +440,14 @@ sol_thread_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus, if (ptid.pid () != -1) { - ptid_t save_ptid = ptid; + ptid_t ptid_for_warning = ptid; ptid = thread_to_lwp (ptid, -2); if (ptid.pid () == -2) /* Inactive thread. */ error (_("This version of Solaris can't start inactive threads.")); if (info_verbose && ptid.pid () == -1) warning (_("Specified thread %ld seems to have terminated"), - save_ptid.tid ()); + ptid_for_warning.tid ()); } rtnval = beneath ()->wait (ptid, ourstatus, options); -- 2.34.1