From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id slLEGxi9CGAGawAAWB0awg (envelope-from ) for ; Wed, 20 Jan 2021 18:30:32 -0500 Received: by simark.ca (Postfix, from userid 112) id 636441EF80; Wed, 20 Jan 2021 18:30:32 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.3 required=5.0 tests=MAILING_LIST_MULTI,RDNS_NONE autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id F2A4F1E590 for ; Wed, 20 Jan 2021 18:30:30 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 250E33857C63; Wed, 20 Jan 2021 23:30:30 +0000 (GMT) Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by sourceware.org (Postfix) with ESMTPS id 4F1F63858010 for ; Wed, 20 Jan 2021 23:30:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4F1F63858010 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rtems.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=joel.sherrill@gmail.com Received: by mail-qk1-f174.google.com with SMTP id n142so49734qkn.2 for ; Wed, 20 Jan 2021 15:30:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iCSe7UnO7V3aLeX0dcl2q9bd1SlPkXyYyoO1zxnzi3c=; b=ebQ5ku1H4JFJ7ii6iO37vR/7OCaSZnbzarDgbHJ7a8L/HmXPa0PmgVV+I13Ec+P5Ax LVJ1mUJWpydmY4eL8pV2BuTp50jG7gmtvWEWsCM30fe5uAncpDGpoEIURY0rSLKoOHm9 Nqc7+9hTdCbCTC7j6ikwayVnWSehObJ1506rGqC61xgH58BGq5Ivz7c5AojvMmYpP0FU BW7UEEA8rq/d16Af8fNW2+29aObJjX4/+KT8yXQu6962ROE023jPOO5O4mnPenOYJwlm AZzxqXrOf8Jynmb9/4Nim9wwZU8omAu3O7QWgVz57CMG6Tw9oXhSQr5RJqX69fAEOW6L UJYw== X-Gm-Message-State: AOAM531/Jed/QkanfGmYfV1fHlEbdxkkZZKyZDkz8Y4yxg4lN9ScM6AI hNCCufZmpCKwNQWpfLtuOatI60GYHAs= X-Google-Smtp-Source: ABdhPJwJ7vgLW2Yg67XZ4PkC0o7w/hr4q6BpzstzYyqJEBMMjzX926ryWqZ+n1glB4cxfIfgsA8HAQ== X-Received: by 2002:a05:620a:1372:: with SMTP id d18mr11953353qkl.6.1611185427043; Wed, 20 Jan 2021 15:30:27 -0800 (PST) Received: from devel.oarcorp.com (gateway.oarcorp.com. [67.63.146.110]) by smtp.gmail.com with ESMTPSA id f24sm2427774qkk.89.2021.01.20.15.30.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jan 2021 15:30:26 -0800 (PST) From: Joel Sherrill To: gdb-patches@sourceware.org Subject: [PATCH] gdb/remote.c: Address conflicting enum and method name Date: Wed, 20 Jan 2021 17:29:59 -0600 Message-Id: <20210120232959.27573-1-joel@rtems.org> X-Mailer: git-send-email 2.24.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joel Sherrill Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" --- gdb/remote.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/remote.c b/gdb/remote.c index b4c6fc2108..5daabf236b 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -1104,7 +1104,7 @@ struct remote_thread_info : public private_thread_info CORE_ADDR watch_data_address = 0; /* Get the thread's resume state. */ - enum resume_state resume_state () const + enum resume_state get_resume_state () const { return m_resume_state; } @@ -6393,7 +6393,7 @@ remote_target::resume (ptid_t ptid, int step, enum gdb_signal siggnal) /* We don't expect the core to ask to resume an already resumed (from its point of view) thread. */ - gdb_assert (remote_thr->resume_state () == resume_state::NOT_RESUMED); + gdb_assert (remote_thr->get_resume_state () == resume_state::NOT_RESUMED); remote_thr->set_resumed_pending_vcont (step, siggnal); return; @@ -6645,7 +6645,7 @@ remote_target::commit_resume () /* If a thread of a process is not meant to be resumed, then we can't wildcard that process. */ - if (priv->resume_state () == resume_state::NOT_RESUMED) + if (priv->get_resume_state () == resume_state::NOT_RESUMED) { get_remote_inferior (tp->inf)->may_wildcard_vcont = false; @@ -6677,7 +6677,7 @@ remote_target::commit_resume () /* If the thread was previously vCont-resumed, no need to send a specific action for it. If we didn't receive a resume request for it, don't send an action for it either. */ - if (remote_thr->resume_state () != resume_state::RESUMED_PENDING_VCONT) + if (remote_thr->get_resume_state () != resume_state::RESUMED_PENDING_VCONT) continue; gdb_assert (!thread_is_in_step_over_chain (tp)); @@ -7803,7 +7803,7 @@ remote_target::select_thread_for_ambiguous_stop_reply { remote_thread_info *remote_thr = get_remote_thread_info (thr); - if (remote_thr->resume_state () != resume_state::RESUMED) + if (remote_thr->get_resume_state () != resume_state::RESUMED) continue; if (first_resumed_thread == nullptr) -- 2.24.3