From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id 40E75385842B; Wed, 10 Nov 2021 05:47:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 40E75385842B Received: by mail-ed1-x531.google.com with SMTP id c8so5730423ede.13; Tue, 09 Nov 2021 21:47:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=M3lf9lxnojYmLIrL0s3uU07vkzBDFCtfMBa9jKKciX8=; b=57o9sP91mAgKRq2y9hiSN4MCsxL8lidtitKZG3Q1AqHACvuV2nQsHqknD9obV6KB7x 68EOLD5Moy4ddKfB1UCG7Kzj8NLKJe/JsKtFeJCtYIaNKE1XQGkKUzcX6BOgImkU3IaV 6T0vGptl9u3wVCsdCFXZyUWBKZ5DtzgY7FAorWOfWnJ1zKVklIYcGBlFBAYhhWq4DKed /Ctjgt4DXxQrBnsd8BdLcMNse5aqDj5LbDh9H5/8+ZQJ+FlKzTPgDv4Yj5aKCYn5S4HV twlSYKkz5cvkWa3N+/fnZQcpI/V9MrX7fCias415p45dniyfBgNWD0nJQNWA9OLtForo TFqw== X-Gm-Message-State: AOAM532eAFUjOJzJIwk9DZWETclblfC/3zt5jER+GcIz+0QmFOvepiE3 hvnXmZmjoRrxUTxmwJfslwWyfv3jPSo= X-Google-Smtp-Source: ABdhPJySJUntO3R1b8JyDr2XW9hQW0kr5jzjAFxPEjUK8XaRZVa/0vWYKM7livw9nzpvufGrDfrWtA== X-Received: by 2002:a05:6402:c05:: with SMTP id co5mr17962033edb.71.1636523241979; Tue, 09 Nov 2021 21:47:21 -0800 (PST) Received: from [10.24.4.78] ([109.190.253.11]) by smtp.googlemail.com with ESMTPSA id go10sm8701541ejc.115.2021.11.09.21.47.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Nov 2021 21:47:21 -0800 (PST) Subject: Re: [PATH][_GLIBCXX_DEBUG] Fix unordered container merge To: Jonathan Wakely Cc: Jonathan Wakely , libstdc++ , gcc-patches References: <4eec3fb9-851e-3e4e-f9f4-1110db3af747@gmail.com> <6c349652-8b6f-2027-08c3-6ce58a765aeb@gmail.com> <22bf1b42-8cf4-7a6e-d5dc-c322ccbb2b46@gmail.com> <68641ea0-2a14-e3a5-8315-a7b3a9c1fdb4@gmail.com> From: =?UTF-8?Q?Fran=c3=a7ois_Dumont?= Message-ID: <3c792e6f-6ee7-200f-84bd-0eb56281888b@gmail.com> Date: Wed, 10 Nov 2021 06:47:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, HTML_MESSAGE, NICE_REPLY_A, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2021 05:47:24 -0000 On 09/11/21 5:25 pm, Jonathan Wakely wrote: > > > On Mon, 8 Nov 2021 at 21:36, François Dumont > wrote: > > Yet another version this time with only 1 guard implementation. > The predicate to invalidate the safe iterators has been externalized. > > Ok to commit ? > > > I like this version a lot - thanks for persisting with it. > > OK to commit, thanks. > > > As an aside ... > > --- a/libstdc++-v3/testsuite/util/testsuite_abi.h > +++ b/libstdc++-v3/testsuite/util/testsuite_abi.h > @@ -24,7 +24,11 @@ >  #include >  #if __cplusplus >= 201103L >  # include > +# ifdef _GLIBCXX_DEBUG > +namespace unord = std::_GLIBCXX_STD_C; > +# else >  namespace unord = std; > +# endif >  #else >  # include >  namespace unord = std::tr1; > > > Several times I've been annoyed by the fact that we don't have a way > to refer to std::_GLIBCXX_STD_C::vector etc. that is always valid, in > normal mode and debug mode. > > Maybe we should add: > > namespace std { namespace _GLIBCXX_STD_C = ::std; } > > That way we can refer to std::_GLIBCXX_STD_C::foo in normal mode, and > it will mean the same thing as in debug mode. So we don't need to use > #if conditions like this. > > Good idea, I'll prepare it. François