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.133.124]) by sourceware.org (Postfix) with ESMTPS id 9848E3858D35 for ; Tue, 7 May 2024 13:45:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9848E3858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9848E3858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715089557; cv=none; b=QXaZQlW5lsBG0mmS4aXZzj6ps0Q2JVMdV4PlACIB4QwfP0VK6wrwdGnVw1w3QjYZh5Uxm2tHvI57D4YVuaCpFdQBSHdAnSY/5UC0A//P25qIcM1AX2bp8WaIp6jAkp41Dj+7CzqFY3CECQxLHLh1LQgVToc82kdbdDuIU7TalRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715089557; c=relaxed/simple; bh=TPauhjL8TXy4TnIl49nDnH8xna35PRL0MF5Ss9rkNQA=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=gSwwM1dGpH2iM+mzkN20AAKZDsbhNyDuDkL317tpA2nGixHJCG6EKZUDZzHsYDXxEEko0FDH2OK/TwsamiN2J9BVER66yIZQUZCjrUTGnnoB14l9qdPb9VTdnDfwv7dEkOQfJrJRjObyNN4UhPM7NoXFvKVEyEjOt0TLxCVuzvA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715089551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ml1Cz+hNCNFWBMipkoPBXnTkmfWHKh1CtWgpK8MBKWE=; b=ITxnc3yxeyXZsjZTlZMOFDm8bU4CuMwxoqrgs9JZaH9jBclvfjoDva3ZXlWB7IkoN8ujQ2 fmDZiQ8J8OMH3jv8KABs9t/PL1ylBIiRZXmZ19rXqz496FDctnSUpqD094NdE1ie2SYxOM OLvnRb7q58m83sECzPUD8/IJ6+bK9N4= Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-250-4UW0inaJMQaJsO57C3WuIg-1; Tue, 07 May 2024 09:45:49 -0400 X-MC-Unique: 4UW0inaJMQaJsO57C3WuIg-1 Received: by mail-yb1-f198.google.com with SMTP id 3f1490d57ef6-de604ccb373so5388384276.2 for ; Tue, 07 May 2024 06:45:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715089548; x=1715694348; h=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=Ml1Cz+hNCNFWBMipkoPBXnTkmfWHKh1CtWgpK8MBKWE=; b=seATcQUqjMFprgg2z/WDXjqy69wpGNc12rabRgKaPOrkw5Cr92qT1/a6ssDZvsQK7K yeda1BYK99P38saiCRLFf+RIPZ40wG3RtfLLrX6Vgf3fQps8bCUVljHbGT7m0w8VlPg0 NyqtHFg9dmKc+QDXYWqk/yjlvjccEasUWqueMKRzmWw8RYawPgQ1KYD7xM6ScjvwGdH8 JY8jBcXipQ0bAgQEFN2C160zfPKWK+y9jAU33E8MASqHHsIMnjgHbtpbfVdN+jHnocTs D2f+vnfPqtBHPApT3TgH12CGesbxqIggyLdcB5C+iU2FMrgzDtCZWZ+nxV1XtOFX0UJX /cyQ== X-Forwarded-Encrypted: i=1; AJvYcCV1XaIXsSk1BeIcXSehkwF322brSw6zTMIi0htdvssKg+5+GHQ8UdighUvdfEh5dNQav73wjJKVUl7Ka5UipmxH1wZkJg+C6w== X-Gm-Message-State: AOJu0YynhR4lo22t273bv0gATKY/a2drLi1sVLkbDkb57zwLXnwCzs2W gMxwpxwVYsz595xkX9uQA8R7YFcK9CvCLM0mutJjgE1Wi/iTwrzwU9/W9ip+CNL+p87Yte2IWDn tZoQYnkx3tRcjrMr/NEcBRGmf4WvA9zIadiZ/svpVnwdUA92OMBioHXCorycUUIGHtyInzgfa+I 4yd2DbtpzxHqSRikjdDSoD7wQH7hP5HA== X-Received: by 2002:a25:ef11:0:b0:de8:c277:1e72 with SMTP id g17-20020a25ef11000000b00de8c2771e72mr12740649ybd.1.1715089548425; Tue, 07 May 2024 06:45:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVVqy94GqqDfqnsMd8g1Xd8Nc/bqDWNh4nOC7E6mQdcE81uAC0QX3jq7C5bK9xZPXHMMih0/ZM7sDuzYlka9M= X-Received: by 2002:a25:ef11:0:b0:de8:c277:1e72 with SMTP id g17-20020a25ef11000000b00de8c2771e72mr12740633ybd.1.1715089548126; Tue, 07 May 2024 06:45:48 -0700 (PDT) MIME-Version: 1.0 References: <20240410085039.267589-1-jwakely@redhat.com> <20240410085039.267589-4-jwakely@redhat.com> In-Reply-To: <20240410085039.267589-4-jwakely@redhat.com> From: Jonathan Wakely Date: Tue, 7 May 2024 14:45:32 +0100 Message-ID: Subject: Re: [PATCH 4/4] libstdc++: Simplify std::variant comparison operators To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 Wed, 10 Apr 2024 at 09:51, Jonathan Wakely wrote: > > Tested x86_64-linux. > > This is just a minor clean-up and could wait for stage 1. Pushed now. > > -- >8 -- > > libstdc++-v3/ChangeLog: > > * include/std/variant (_VARIANT_RELATION_FUNCTION_TEMPLATE): > Simplify. > --- > libstdc++-v3/include/std/variant | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) > > diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant > index 5ba6d9d42e3..2be0f0c1db7 100644 > --- a/libstdc++-v3/include/std/variant > +++ b/libstdc++-v3/include/std/variant > @@ -1245,7 +1245,7 @@ namespace __variant > # define _VARIANT_RELATION_FUNCTION_CONSTRAINTS(TYPES, OP) > #endif > > -#define _VARIANT_RELATION_FUNCTION_TEMPLATE(__OP, __NAME) \ > +#define _VARIANT_RELATION_FUNCTION_TEMPLATE(__OP) \ > template \ > _VARIANT_RELATION_FUNCTION_CONSTRAINTS(_Types, __OP) \ > constexpr bool \ > @@ -1262,22 +1262,20 @@ namespace __variant > { \ > auto& __this_mem = std::get<__rhs_index>(__lhs); \ > __ret = __this_mem __OP __rhs_mem; \ > + return; \ > } \ > - else \ > - __ret = (__lhs.index() + 1) __OP (__rhs_index + 1); \ > } \ > - else \ > - __ret = (__lhs.index() + 1) __OP (__rhs_index + 1); \ > + __ret = (__lhs.index() + 1) __OP (__rhs_index + 1); \ > }, __rhs); \ > return __ret; \ > } > > - _VARIANT_RELATION_FUNCTION_TEMPLATE(<, less) > - _VARIANT_RELATION_FUNCTION_TEMPLATE(<=, less_equal) > - _VARIANT_RELATION_FUNCTION_TEMPLATE(==, equal) > - _VARIANT_RELATION_FUNCTION_TEMPLATE(!=, not_equal) > - _VARIANT_RELATION_FUNCTION_TEMPLATE(>=, greater_equal) > - _VARIANT_RELATION_FUNCTION_TEMPLATE(>, greater) > + _VARIANT_RELATION_FUNCTION_TEMPLATE(<) > + _VARIANT_RELATION_FUNCTION_TEMPLATE(<=) > + _VARIANT_RELATION_FUNCTION_TEMPLATE(==) > + _VARIANT_RELATION_FUNCTION_TEMPLATE(!=) > + _VARIANT_RELATION_FUNCTION_TEMPLATE(>=) > + _VARIANT_RELATION_FUNCTION_TEMPLATE(>) > > #undef _VARIANT_RELATION_FUNCTION_TEMPLATE > > -- > 2.44.0 >