From patchwork Fri Jun 8 16:08:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 27719 Received: (qmail 61483 invoked by alias); 8 Jun 2018 16:08:10 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 61452 invoked by uid 89); 8 Jun 2018 16:08:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=2144, transfer X-HELO: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.143.36) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 08 Jun 2018 16:08:08 +0000 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway31.websitewelcome.com (Postfix) with ESMTP id B56BE2BA7B for ; Fri, 8 Jun 2018 11:08:06 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id RJvqfwTWCPvAdRJvqf9140; Fri, 08 Jun 2018 11:08:06 -0500 X-Authority-Reason: nr=8 Received: from 75-166-19-45.hlrn.qwest.net ([75.166.19.45]:38936 helo=pokyo.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fRJvq-000Uhg-AO; Fri, 08 Jun 2018 11:08:06 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [FYI] Fix gdb mingw build Date: Fri, 8 Jun 2018 10:08:03 -0600 Message-Id: <20180608160803.16455-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fRJvq-000Uhg-AO X-Source-Sender: 75-166-19-45.hlrn.qwest.net (pokyo.Home) [75.166.19.45]:38936 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes I noticed that the mingw build was failing in the buildbot. This patch fixes the problem. I'm checking it in as obvious. gdb/ChangeLog 2018-06-08 Tom Tromey * windows-nat.c (windows_nat_target::xfer_partial): "beneath" is now a method. --- gdb/ChangeLog | 5 +++++ gdb/windows-nat.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4f732b5b81..a10155bd95 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-06-08 Tom Tromey + + * windows-nat.c (windows_nat_target::xfer_partial): "beneath" is + now a method. + 2018-06-08 Tom Tromey * btrace.c (parse_xml_raw): Use gdb::unique_xmalloc_ptr. diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index e3e36cdc3e..63a780014a 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2953,8 +2953,8 @@ windows_xfer_shared_libraries (struct target_ops *ops, enum target_xfer_status windows_nat_target::xfer_partial (enum target_object object, const char *annex, gdb_byte *readbuf, - const gdb_byte *writebuf, ULONGEST offset, ULONGEST len, - ULONGEST *xfered_len) + const gdb_byte *writebuf, ULONGEST offset, + ULONGEST len, ULONGEST *xfered_len) { switch (object) { @@ -2966,16 +2966,16 @@ windows_nat_target::xfer_partial (enum target_object object, writebuf, offset, len, xfered_len); default: - if (beneath == NULL) + if (beneath () == NULL) { /* This can happen when requesting the transfer of unsupported objects before a program has been started (and therefore with the current_target having no target beneath). */ return TARGET_XFER_E_IO; } - return beneath->xfer_partial (object, annex, - readbuf, writebuf, offset, len, - xfered_len); + return beneath ()->xfer_partial (object, annex, + readbuf, writebuf, offset, len, + xfered_len); } }