Remove make_cleanup_restore_current_uiout
This removes make_cleanup_restore_current_uiout in favor of an RAII-based class. 2016-10-21 Tom Tromey <tom@tromey.com> * stack.c (print_stack_frame_to_uiout): Use scoped_restore. * ui-out.c (make_cleanup_restore_current_uiout) (restore_current_uiout_cleanup): Remove. * infrun.c (print_stop_event): Use scoped_restore. * ui-out.h (make_cleanup_restore_current_uiout): Don't declare.
This commit is contained in:
parent
d1e4a62469
commit
67ad9399e2
6 changed files with 16 additions and 38 deletions
14
gdb/infrun.c
14
gdb/infrun.c
|
@ -8084,22 +8084,20 @@ print_stop_location (struct target_waitstatus *ws)
|
|||
void
|
||||
print_stop_event (struct ui_out *uiout)
|
||||
{
|
||||
struct cleanup *old_chain;
|
||||
struct target_waitstatus last;
|
||||
ptid_t last_ptid;
|
||||
struct thread_info *tp;
|
||||
|
||||
get_last_target_status (&last_ptid, &last);
|
||||
|
||||
old_chain = make_cleanup_restore_current_uiout ();
|
||||
current_uiout = uiout;
|
||||
{
|
||||
scoped_restore save_uiout = make_scoped_restore (¤t_uiout, uiout);
|
||||
|
||||
print_stop_location (&last);
|
||||
print_stop_location (&last);
|
||||
|
||||
/* Display the auto-display expressions. */
|
||||
do_displays ();
|
||||
|
||||
do_cleanups (old_chain);
|
||||
/* Display the auto-display expressions. */
|
||||
do_displays ();
|
||||
}
|
||||
|
||||
tp = inferior_thread ();
|
||||
if (tp->thread_fsm != NULL
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue