From 6792b55e08ec49f40916d4f8d7168d0047b9e928 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 16 Jun 2019 09:41:06 -0600 Subject: [PATCH] Use new and delete for TUI windows This changes tui_win_info to use new and delete, rather than XNEW and xfree. gdb/ChangeLog 2019-06-25 Tom Tromey * tui/tui-data.h (struct tui_win_info): Add constructor. * tui/tui-data.c (tui_alloc_win_info): Use new. (tui_free_window): Use delete. --- gdb/ChangeLog | 6 ++++++ gdb/tui/tui-data.c | 5 ++--- gdb/tui/tui-data.h | 7 +++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 29c568f5d3c..b4395c01384 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-06-25 Tom Tromey + + * tui/tui-data.h (struct tui_win_info): Add constructor. + * tui/tui-data.c (tui_alloc_win_info): Use new. + (tui_free_window): Use delete. + 2019-06-22 Tom Tromey * tui/tui-windata.h (tui_first_data_element_no_in_line): Don't diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index b67cb48c2e6..117bda3c200 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -531,9 +531,8 @@ init_win_info (struct tui_win_info *win_info) struct tui_win_info * tui_alloc_win_info (enum tui_win_type type) { - struct tui_win_info *win_info = XNEW (struct tui_win_info); + struct tui_win_info *win_info = new struct tui_win_info (type); - win_info->generic.type = type; init_win_info (win_info); return win_info; @@ -654,7 +653,7 @@ tui_free_window (struct tui_win_info *win_info) } if (win_info->generic.title) xfree (win_info->generic.title); - xfree (win_info); + delete win_info; } diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index c696feed280..047ee35d984 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -271,6 +271,13 @@ struct tui_command_info /* This defines information about each logical window. */ struct tui_win_info { + explicit tui_win_info (enum tui_win_type type) + { + generic.type = type; + } + + DISABLE_COPY_AND_ASSIGN (tui_win_info); + struct tui_gen_win_info generic; /* General window information. */ union { -- 2.30.2