From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id DB36C3817F86 for ; Thu, 15 Dec 2022 16:26:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DB36C3817F86 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671121564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fG5D+n6l1Ro0jCMyxIH2s132xk1iR7hlFLaIbbAwMkU=; b=aQUd+XAjTulpBXARyFivSExAGRa9b/qq7duM92X5COrq6qi9DQw9VEnWEZZ6yqKvo9hKLY EQKAr9RwHcQcJ33f2J3KZytEAwHMhwh40c7AXvrae/2k/vHBPcfr4Nzt1mHDoTMFbbC1aO ydZqTn+gTUf0x2x+qQJbGjIXzu4wcZg= Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-321-n3V5bboBMsS4hnTTvgP7gw-1; Thu, 15 Dec 2022 11:26:01 -0500 X-MC-Unique: n3V5bboBMsS4hnTTvgP7gw-1 Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-411c31a2c20so41331727b3.12 for ; Thu, 15 Dec 2022 08:26:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fG5D+n6l1Ro0jCMyxIH2s132xk1iR7hlFLaIbbAwMkU=; b=rvHGMereZ9YvVgok0aMWG9a9fP2FvdiyXDU5Q18DF4PdNC2K5/KonUsxOo4f6eNc6t gqwiW/ok1vdXOFrk7msCJn1280nrvA/UIK3r66cTjpzGsYKYVj8HhvvXfR7/w0mm/RqE gvIPP78baTYFQOJqPKftZFeIxsHJ2Iy+hC2e7KU3/oQaodZptCZz0Kp/SAD4KXDuzf6r y1yj/TujUZJRU3EzwuipSDOG+er5tjaNGzr4o4JTs0DtN9egtNhqg+fxyPncNe5bMMM/ Ai1Q0ag9VVTwekNPPfSXd3iDpnNxBpmK3ZZS5f8ZSC0Vz6pzM3Z8ym9h09y/Z73Z6bkb m2RA== X-Gm-Message-State: ANoB5plO++T0Lyc+B87PlzE3CHpf2H7qOWrqALFRdnrSygYmag3EEsHf 4suX/8wn9TRpgeFQkTl/XLISIzo7Gxd2Gt3slGwoRzpqtshsmF/ZpFDV+o1EYpQTMqpJaLMRL3E gB86N72QGP1Kfq4c= X-Received: by 2002:a25:3c1:0:b0:711:a37b:d738 with SMTP id 184-20020a2503c1000000b00711a37bd738mr24690028ybd.1.1671121560988; Thu, 15 Dec 2022 08:26:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf79ogYOPEoDpUl9CwcngKQY13aSFA9OcytkeJzXSjrRxE473il4QmCrA4LxfJ2nhosx14xuhg== X-Received: by 2002:a25:3c1:0:b0:711:a37b:d738 with SMTP id 184-20020a2503c1000000b00711a37bd738mr24690006ybd.1.1671121560698; Thu, 15 Dec 2022 08:26:00 -0800 (PST) Received: from [192.168.1.108] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id h19-20020a05620a245300b006cebda00630sm12522073qkn.60.2022.12.15.08.25.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Dec 2022 08:25:59 -0800 (PST) Message-ID: <7710b032-cbe4-4ce7-d885-44e8dafbc2d1@redhat.com> Date: Thu, 15 Dec 2022 11:25:59 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: Re: [PATCH 1/4] contracts: Lowercase {MAYBE,NEVER}_CONTINUE To: =?UTF-8?Q?Arsen_Arsenovi=c4=87?= , gcc-patches@gcc.gnu.org Cc: jwakely@redhat.com, libstdc++@gcc.gnu.org References: <20221210094303.2180127-1-arsen@aarsen.me> <20221210094303.2180127-2-arsen@aarsen.me> From: Jason Merrill In-Reply-To: <20221210094303.2180127-2-arsen@aarsen.me> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 12/10/22 04:43, Arsen Arsenović wrote: > The lowercase constants are more consistent with the standard, and it is > unlikely that the uppercase versions would've been accepted. OK. > 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. > --- > 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 {