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 D8EE03858D1E for ; Tue, 7 May 2024 13:45:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D8EE03858D1E 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 D8EE03858D1E 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=1715089552; cv=none; b=VVn7hjdUwtt2gcDB6nAtX6FzKYjlmAXRQUMGD6gTOW6fj+/jtnDHDO8eJDjK9k+/3o2Iwcqd5TBEvZpWyAEdC8v7FLRkh+x/O/uBn7nzmaxOfHHNWynfHh2O3aF9RSRYr+QEI7J7F13crPB0eC2m8/v7H0+3aFV11TXbutOw8os= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715089552; c=relaxed/simple; bh=TPauhjL8TXy4TnIl49nDnH8xna35PRL0MF5Ss9rkNQA=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=MsOFkC9/7mLwX0lmDMsA8kEt2RmcKiPrX8qLEP8oGtMbSI179Nbae5BZaH8Oc+s41zlxEV1YhDLcxkQ60CPJumAL8GXcb2hs5kmKSX2Zj1MMKep0JfjKm3agvvGs/59VmzcDllOzLGHQxIuxeRPxkzJaxzs/BlfWO6AbCvFbPaI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715089550; 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=MdptYU3IQLwrBu+uwACeDDL3WAe+P1tR8PG1Bn/h+y6heX2z1WfLovwCoNvJ4v5VgdOAvK 3BTABhcMcDsW81V09ZjAE2Kv5Nl1SNyE6YNjKC+iPlI4uE3YXHpODh4vnAhXyszmWuu/2F V5OOLEEh3iGviu8awaJr2wRza1Cc1pE= Received: from mail-yw1-f199.google.com (mail-yw1-f199.google.com [209.85.128.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-426-nHXLNYyCMoO5SFCzr0R1EQ-1; Tue, 07 May 2024 09:45:48 -0400 X-MC-Unique: nHXLNYyCMoO5SFCzr0R1EQ-1 Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-61be26af113so59164977b3.1 for ; Tue, 07 May 2024 06:45:48 -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=MCcPpsU/hhF5duBze3uUoD6QpzvAcF6yHls3JoIiPMazPIuGXcTN2+g+3vpsEMmujC zOXeL6i3ZJmyabDNnURr//PekSSeFWtpX+hxJicr8YTe2jYHHz1YjQeV3WVTV++hyHMt EyQ3Wozv4R4BCvFJKHRNjkHxdx8Dmy49SD0Whf1MJCSXN3Xk9HphWq8YLiRvV8P3sW7w X/JdomjiV63ZvL7I2H93b+Z/DBfmKjb4nuI4MwGbFwocdMP8k3Qxfi4PokiefNauZfp4 BpqkJjPmsCfqDxHrEyyae7WAmlgXW08qH/bWJYdYNqww7cc2Das08/o/xRm0+QM8+wAH KvUw== X-Gm-Message-State: AOJu0YzibtBEjmfx8Y57Crf/aJD3FFn1ku+M0KB3y+PGz7R95gUnP/cd pQCuBN4G7kXFj13X8PZryG/AEJzBuQYhII5LguEc8nkXwGeY9MIBWoMZkHtiAKnt783AHkWME/S u1J0mN6pVd6aoyV44vUrsP5+u/bzZ8js8uFX/B9kQOER09qzLo6vmwKDeau1M0L73JbNmsAznEz ngZ3k0RCPA7UWxopY5L/3gTpYQFIWjgmJL/Pk= X-Received: by 2002:a25:ef11:0:b0:de8:c277:1e72 with SMTP id g17-20020a25ef11000000b00de8c2771e72mr12740647ybd.1.1715089548410; 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.7 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=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: 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 >