From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by sourceware.org (Postfix) with ESMTPS id 63A913858D28 for ; Fri, 8 Apr 2022 19:42:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 63A913858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-f52.google.com with SMTP id w4so14322827wrg.12 for ; Fri, 08 Apr 2022 12:42:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=UPHBh6PAMdS2L06gQET+oFkqQenckpq12k/gzbacDGw=; b=2+XAGvs2mtrhwcolelQt/lwaNr+2ad1Os7LNiCgJP1iC5T7WHYQD4KJlI9m7tS1bvX TUtB/BRmmSPVXGcKdf+4Nfsm9dMnOKNbRgd3QULv8MukUC0uzZk6XD0xb6Wc7VmjyfZp 4pRPN2FeD7hb/9AN5XLF+vZj45mnXNWVmtZtiYQOEfgcHqil6T9boA5CX+QPx+JhkA9p u7pl0D85icTqIQ53TwmUPffGo9FkWIsrdJg/RY+Z631RbPObYbZYfzrrlDMbli36uDwR pE1MeCPSDiHRL1Bf74voc/x5B3EnCKpg6HdribLpyNHusBFE87YCNf0OU899W4FwCBjm Trsw== X-Gm-Message-State: AOAM531mmTNec0ASmfvRcztLdIlM32XY5DK0U3cEl+gtsbieEELdRCxr RH73YSolhpqOST1CsDfqmR2UFYhmSjU= X-Google-Smtp-Source: ABdhPJyfV4mzpHfxJdcLG5QSP8B71e/lG/h6dwTcZnrgrZCkwsxabaxUIg5xFAdasmq83hPwfZAdfA== X-Received: by 2002:adf:fecf:0:b0:1f0:62e0:bcd8 with SMTP id q15-20020adffecf000000b001f062e0bcd8mr15938764wrs.61.1649446933676; Fri, 08 Apr 2022 12:42:13 -0700 (PDT) Received: from localhost ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id p8-20020a5d59a8000000b00204178688d3sm23292925wrr.100.2022.04.08.12.42.11 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 08 Apr 2022 12:42:11 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH] Make intrusive_list_node's next/prev private Date: Fri, 8 Apr 2022 20:42:10 +0100 Message-Id: <20220408194210.3687659-1-pedro@palves.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org 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: , X-List-Received-Date: Fri, 08 Apr 2022 19:42:17 -0000 Tromey noticed that intrusive_list_node leaves its data members public, which seems sub-optimal. This commit makes intrusive_list_node's data fields private. intrusive_list_iterator, intrusive_list_reverse_iterator, and intrusive_list do need to access the fields, so they are made friends. Change-Id: Ia8b306b40344cc218d423c8dfb8355207a612ac5 --- gdbsupport/intrusive_list.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gdbsupport/intrusive_list.h b/gdbsupport/intrusive_list.h index 77eeeeec5fd..6812266159a 100644 --- a/gdbsupport/intrusive_list.h +++ b/gdbsupport/intrusive_list.h @@ -24,15 +24,26 @@ /* A list node. The elements put in an intrusive_list either inherit from this, or have a field of this type. */ template -struct intrusive_list_node +class intrusive_list_node { +public: bool is_linked () const { return next != INTRUSIVE_LIST_UNLINKED_VALUE; } +private: T *next = INTRUSIVE_LIST_UNLINKED_VALUE; T *prev = INTRUSIVE_LIST_UNLINKED_VALUE; + + template + friend struct intrusive_list_iterator; + + template + friend struct intrusive_list_reverse_iterator; + + template + friend struct intrusive_list; }; /* Follows a couple types used by intrusive_list as template parameter to find base-commit: 9f184a64f51b00fd5c208c8528f6a553f5b27c1c -- 2.26.2