From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id 121AD3850631; Sat, 10 Dec 2022 11:15:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 121AD3850631 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-x632.google.com with SMTP id vp12so17217607ejc.8; Sat, 10 Dec 2022 03:15:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=f3o1JGjE4SYbG9g3ftJGCs1ooP3b77ayvAOHnynNQFQ=; b=IoU06EPjFrNhTOzGLrAqBaHsDx6/1yppOZ8iRfmaf8v+36G9cyJOQMjjXkOPef87L2 0/eaVrXTqfDDjEjKkXUfQV/w41biA6+hrWYTIT9ZmlKNUJ+uH/FMmiKi3EzNDhonLe2C G7prsibQyCOBX9XqHtg0ramws1Cg0TWIJL1IC310sd0EADLghT+lRF0IjcSepXFzhjJw m5sE9Sp4zcJf61ckoGsEZRYcScc20+YXEaUqbmCzv+kEqmcIeNWmdIeOvlcIVRWVbI8/ BsGlRbgbVJ1nfUp8zsrLWW4G/MtTA5M56NNIZ9X+35unk7L0jxGcJpwZ15+hCor1meUA Zx9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=f3o1JGjE4SYbG9g3ftJGCs1ooP3b77ayvAOHnynNQFQ=; b=DPU+Za6/Q0S9OvBCyFeqkD0bfs8iN38dsS0tOu1F3J2lgt0AVm8N0C2PBYZTJ0NYKs S0EWvMmfjYHPkR8d1ddyNpoLtnxaI2XbyQBEyh+jekBSyr2rkdkaVvXTZHtAE8XlNE7+ f8moKHAgrFjzFK2Lz/ST/LXrfPMX6F7KqoNPp+oMYrxKnEyVZfGVQphYFybslKH6f/qN SdiBp34hmwkM/d8Ro1z+o3mvjb2/jS0FPGPL5zYOS6yPxHr7y/mQ1V8dds4K7XaDZoH3 tFNYRGphRuqsMeF3GKRMEIXf2HYa27YsGstoTVTmUiytNubWXfZR8qSy13f/iO+TVz2S pntw== X-Gm-Message-State: ANoB5pl2wYR/s8+Z9CjDieDyjPNjAKgWf16dgJz9Jw4/ztIsb6TxT8Oo 577bg+xl/vT04jVxezpTNDyDo1WzqSkhZThU7ic= X-Google-Smtp-Source: AA0mqf6NXParxtrSNY/lEsbKLtbe3C+xaS4ZHtiM2RVcQ2onebNFL+FTrguG40o04hvCDyd08IVaGJ+SQ6iRAM96LIA= X-Received: by 2002:a17:906:518c:b0:7c1:98f:c16a with SMTP id y12-20020a170906518c00b007c1098fc16amr9776061ejk.215.1670670917643; Sat, 10 Dec 2022 03:15:17 -0800 (PST) MIME-Version: 1.0 References: <20221210094303.2180127-1-arsen@aarsen.me> <20221210094303.2180127-2-arsen@aarsen.me> In-Reply-To: <20221210094303.2180127-2-arsen@aarsen.me> From: Jonathan Wakely Date: Sat, 10 Dec 2022 11:15:05 +0000 Message-ID: Subject: Re: [PATCH 1/4] contracts: Lowercase {MAYBE,NEVER}_CONTINUE To: =?UTF-8?Q?Arsen_Arsenovi=C4=87?= Cc: gcc-patches , Jason Merrill , Jonathan Wakely , "libstdc++" Content-Type: multipart/alternative; boundary="00000000000095333105ef77629a" X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --00000000000095333105ef77629a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, 10 Dec 2022, 09:51 Arsen Arsenovi=C4=87 via Libstdc++, < libstdc++@gcc.gnu.org> wrote: > The lowercase constants are more consistent with the standard, and it is > unlikely that the uppercase versions would've been accepted. > > gcc/cp/ChangeLog: > > * contracts.cc: Rename references to > contract_violation_continuation_mode constants to be lowercase. > > libstdc++-v3/ChangeLog: > > * include/experimental/contract: Lowercase the constants in > contract_violation_continuation_mode. > OK as far as the library side goes. --- > gcc/cp/contracts.cc | 4 ++-- > libstdc++-v3/include/experimental/contract | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc > index 45f52b20392..26316372389 100644 > --- a/gcc/cp/contracts.cc > +++ b/gcc/cp/contracts.cc > @@ -41,9 +41,9 @@ along with GCC; see the file COPYING3. If not see > "v > 0", // comment, > "default", // assertion_level, > "default", // assertion_role, > - MAYBE_CONTINUE, // continuation_mode > + maybe_continue, // continuation_mode > }); > - terminate (); // if NEVER_CONTINUE > + terminate (); // if never_continue > } > > We use an internal type with the same layout as contract_violation > rather > diff --git a/libstdc++-v3/include/experimental/contract > b/libstdc++-v3/include/experimental/contract > index cf655023da7..a2babed6301 100644 > --- a/libstdc++-v3/include/experimental/contract > +++ b/libstdc++-v3/include/experimental/contract > @@ -45,7 +45,7 @@ namespace experimental > { > // From P1332 > enum class contract_violation_continuation_mode { > - NEVER_CONTINUE, MAYBE_CONTINUE > + never_continue, maybe_continue > }; > > class contract_violation { > -- > 2.38.1 > > --00000000000095333105ef77629a--