From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 111307 invoked by alias); 25 Jun 2019 13:57:09 -0000 Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: gdb-cvs-owner@sourceware.org List-Subscribe: Sender: gdb-cvs-owner@sourceware.org Received: (qmail 111257 invoked by uid 306); 25 Jun 2019 13:57:09 -0000 Date: Tue, 25 Jun 2019 13:57:00 -0000 Message-ID: <20190625135709.111256.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Use new and delete for TUI windows X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 8e5cb9a54e156ba24a439aefa7b35e53b4cb0374 X-Git-Newrev: 6792b55e08ec49f40916d4f8d7168d0047b9e928 X-SW-Source: 2019-06/txt/msg00137.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6792b55e08ec49f40916d4f8d7168d0047b9e928 commit 6792b55e08ec49f40916d4f8d7168d0047b9e928 Author: Tom Tromey Date: Sun Jun 16 09:41:06 2019 -0600 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. Diff: --- 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 29c568f..b4395c0 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 b67cb48..117bda3 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 c696fee..047ee35 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 {