From e587ef421eb7e009c6a69da55c269e9df45093e4 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 23 Jan 2019 18:58:30 +0000 Subject: [PATCH] Use SCOPE_EXIT in gdbarch-selftest.c Replace the custom local class with a SCOPE_EXIT. gdb/ChangeLog: 2019-01-23 Pedro Alves * gdbarch-selftests.c (struct on_exit): Use SCOPE_EXIT. --- gdb/ChangeLog | 4 ++++ gdb/gdbarch-selftests.c | 8 +------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 008208e..6395791 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,8 @@ 2019-01-23 Pedro Alves + + * gdbarch-selftests.c (struct on_exit): Use SCOPE_EXIT. + +2019-01-23 Pedro Alves Andrew Burgess * gdbthread.h: Include "common/forward-scope-exit.h". diff --git a/gdb/gdbarch-selftests.c b/gdb/gdbarch-selftests.c index 50062ab..64d1e54 100644 --- a/gdb/gdbarch-selftests.c +++ b/gdb/gdbarch-selftests.c @@ -104,13 +104,7 @@ register_to_value_test (struct gdbarch *gdbarch) push_target (&mock_target); /* Pop it again on exit (return/exception). */ - struct on_exit - { - ~on_exit () - { - pop_all_targets_at_and_above (process_stratum); - } - } pop_targets; + SCOPE_EXIT { pop_all_targets_at_and_above (process_stratum); }; /* Switch to the mock thread. */ scoped_restore restore_inferior_ptid -- 2.7.4