From patchwork Mon Mar 13 10:35:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 68731 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1104780wrd; Mon, 13 Mar 2023 03:36:02 -0700 (PDT) X-Google-Smtp-Source: AK7set8Kc2zBz6MlQKXzllA2xh2eEgbq+qymMKHOZDQJdils/Yr3/i/UkdF+RlYe5rmLqimFM+M5 X-Received: by 2002:a17:906:dacd:b0:88d:ba89:1837 with SMTP id xi13-20020a170906dacd00b0088dba891837mr13551130ejb.8.1678703762694; Mon, 13 Mar 2023 03:36:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678703762; cv=none; d=google.com; s=arc-20160816; b=jqUAyYEdoa1X7PiBPcQact44VmZRl1L9Y4hk8CyeCBHXXgf9oLWD3MV7Fs+j+aFy/L E4Nwz2i5XOTT2/N5uBvh7kz+5ZmHt4MqnkfDkizo5l+PKGHoXx8STX1a96NAyeUBrjvI iBj4zSLq03nGBqb98ARL/c/5Qx6bCKXRqTLl1t+fEfuQclzov79IQaEdyEBapXPi+4wS UBA/mCPVL3vPbneicIDJKZhaPqn/vgZl1HXI+eaGp0tmCNbIK/wYkLnp+83mdBqoyIrO it4p1rzLO8hh8RMmlb74V2WequKYa19kPBBLtiSfWqvsJOwrcDObmxuoYdrNmmv0dAHw PNrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=U9PUxgJcSqPOHa9srimpR8BZgDXwtw48g6wD84gO+mM=; b=eeKoT6PnMEANkFemaAFErD/mB8Egr5U8Y/av+lxxs39SD/MtlrXdVXXImbgCs59K5P S82ZYAZGOROqYRfBF8vD2z2GLSU2/9CqJgxT7lhtfl9xHjhB/+KywBjN8v2DB1qXKjp0 aDQcylYpeoUTJhBRkeooYZFc8mlqgO7sbSk7wYygXZOkESfcWv0eHvQBGUSycTF8JO5T 25Sxtmj8Yx12V/3vewl3mhpWFLGtsiPZ1wvq2hWckhZR/qwOTSCJ8K7nD75rx7NdKjEa zNu+pQWGL7SOB/wAdPN2dYw2b9AyOnBtEMTBC6ewXgQHvJUjMgh1ZEK86ZbwjodOVG8B 1u7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=uGeWjZxl; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id i22-20020aa7dd16000000b004fb5e548e15si4830777edv.600.2023.03.13.03.36.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 03:36:02 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=uGeWjZxl; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0FE9038582AC for ; Mon, 13 Mar 2023 10:35:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0FE9038582AC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678703756; bh=U9PUxgJcSqPOHa9srimpR8BZgDXwtw48g6wD84gO+mM=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=uGeWjZxlCJk6uI715sBKIi/FMOlWSzLYhcXgDKz02RXd9sv4N1FDuQty5A/6An8WZ daPrmo2775gU70AbFPjS8L6vyIM/+3C8zjM7FpwtMpW7gpgz21nfcKKuE7Mb7hiXOq ppLUrq6iJoFGhqpy7JkaZGpziRWCQ9AcHrcBLTB0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 2C5C73858CDB for ; Mon, 13 Mar 2023 10:35:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2C5C73858CDB Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-321-ufwTZpK5MyC2bf3pazxgYQ-1; Mon, 13 Mar 2023 06:35:09 -0400 X-MC-Unique: ufwTZpK5MyC2bf3pazxgYQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 469D43C0F224; Mon, 13 Mar 2023 10:35:09 +0000 (UTC) Received: from localhost (unknown [10.33.36.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F5DF202701E; Mon, 13 Mar 2023 10:35:08 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Jonny Grant Subject: [committed] libstdc++: Fix typo in comment Date: Mon, 13 Mar 2023 10:35:08 +0000 Message-Id: <20230313103508.2543385-1-jwakely@redhat.com> In-Reply-To: <2f774778-00f1-b5f1-ace1-6efec29275c6@jguk.org> References: <2f774778-00f1-b5f1-ace1-6efec29275c6@jguk.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 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_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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760248476693048470?= X-GMAIL-MSGID: =?utf-8?q?1760248476693048470?= Pushed to trunk. -- >8 -- Reported by Jonny Grant. libstdc++-v3/ChangeLog: * include/bits/allocator.h: Fix typo in comment. --- libstdc++-v3/include/bits/allocator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h index be67789c1cd..abbd753d33d 100644 --- a/libstdc++-v3/include/bits/allocator.h +++ b/libstdc++-v3/include/bits/allocator.h @@ -62,7 +62,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Since C++20 the primary template should be used for allocator, // but then it would have a non-trivial default ctor and dtor for C++20, - // but trivial for C++98-17, which would be an ABI incompatibiliy between + // but trivial for C++98-17, which would be an ABI incompatibility between // different standard dialects. So C++20 still uses the allocator // explicit specialization, with the historical ABI properties, but with // the same members that are present in the primary template.