From patchwork Wed Dec 1 10:25:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 48331 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5EBB23858406 for ; Wed, 1 Dec 2021 10:32:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5EBB23858406 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1638354779; bh=+BA7h3YVFMJk1cQ15NMHFL2vkQ1eUdT9EYZA+q3ABEg=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Ok4oNt/nRs7VX5lVAD9V4yXAiYcVx6HgMpq/WQlp9LVVzyyuuAhT4G4O4purTArCP fMT5rHyyaoDsTqjehyOqX7EDCQz1lpc745VbntRRoFROYKci9XDxMA+JpYtwbCRcxs ie3TOkI7IeTNuqrVnDCib4ljNYgjV8iQeE+F/AFQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id B1E753858018 for ; Wed, 1 Dec 2021 10:25:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B1E753858018 Received: by mail-wm1-x332.google.com with SMTP id k37-20020a05600c1ca500b00330cb84834fso21835960wms.2 for ; Wed, 01 Dec 2021 02:25:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=+BA7h3YVFMJk1cQ15NMHFL2vkQ1eUdT9EYZA+q3ABEg=; b=hZOa2tI7fAfqkvZkLHJboo47bkgY7/jih5C3QcnPwQy2q1WJQxW/Wk2i6x34MqRSf2 Nxbq5H0u7BMFGq3yZsioUpwo/H8wlTktTTjyL8O6GfjF+gcVq/cusZV5GrP+vQbU/38J de5T/P8qyLpjGgsRQRlC8eUiMTQtx7XYVaRLTzdp+ZDI3buBKKsdKuy5g4TmmtrsZeqY yjE5SP6Xhg5qxP6ZBhc5JJHmoksGkhY9OFaB6HIxJ1RU0iiel9mu1C3Hugp7NFDyfBiv aV6ZDiBmszPYhEY6pTpzUtwy488OR31gZSoaxDuF/QyFmwdX/uSX9j1MOMaO4wGUdRQh Hclg== X-Gm-Message-State: AOAM531vNYX0t+D9QqkrJotkCqYWRfoTesRy7wCYHN8OLmY/a7T3Grwk 9DksZWHG/zkNbmB7rjegmtXErPEDbBi3c573 X-Google-Smtp-Source: ABdhPJzrYRylP+XqMGitjlrwMU7Nyou/b3k3APztcdFWfJ+B9xVggk9UO02i5yCWTiJCyu+paZ5TJQ== X-Received: by 2002:a05:600c:1c13:: with SMTP id j19mr5821764wms.175.1638354331852; Wed, 01 Dec 2021 02:25:31 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id a9sm18941107wrt.66.2021.12.01.02.25.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 02:25:31 -0800 (PST) Date: Wed, 1 Dec 2021 10:25:29 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Sync whitespace between variants of Indefinite_Holders unit Message-ID: <20211201102529.GA1635109@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Piotr Trojanek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Remove insignificant whitespace diffs between atomic and non-atomic variants of Ada.Containers.Indefinite_Holders. This will simplify review and modification of both variants in the future. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * libgnat/a-coinho.ads: Sync whitespace with a-coinho__shared.ads. * libgnat/a-coinho__shared.ads: Sync whitespace with a-coinho.ads. diff --git a/gcc/ada/libgnat/a-coinho.ads b/gcc/ada/libgnat/a-coinho.ads --- a/gcc/ada/libgnat/a-coinho.ads +++ b/gcc/ada/libgnat/a-coinho.ads @@ -127,8 +127,7 @@ private overriding procedure Adjust (Container : in out Holder); overriding procedure Finalize (Container : in out Holder); - type Reference_Control_Type is new Controlled with - record + type Reference_Control_Type is new Controlled with record Container : Holder_Access; end record; diff --git a/gcc/ada/libgnat/a-coinho__shared.ads b/gcc/ada/libgnat/a-coinho__shared.ads --- a/gcc/ada/libgnat/a-coinho__shared.ads +++ b/gcc/ada/libgnat/a-coinho__shared.ads @@ -69,6 +69,7 @@ package Ada.Containers.Indefinite_Holders is procedure Query_Element (Container : Holder; Process : not null access procedure (Element : Element_Type)); + procedure Update_Element (Container : in out Holder; Process : not null access procedure (Element : in out Element_Type)); @@ -105,6 +106,7 @@ private use Ada.Streams; type Element_Access is access all Element_Type; + type Holder_Access is access all Holder; type Shared_Holder is record