From patchwork Fri Sep 16 16:17:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1254 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5044:0:0:0:0:0 with SMTP id h4csp828641wrt; Fri, 16 Sep 2022 09:19:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5jo6viRXxi9uAKIChWS8VGafNMdinFMWOvPu6BS14uuKT8jHkAH60+dchooE8tyEE64CDv X-Received: by 2002:a17:907:6d08:b0:77b:d4f:e409 with SMTP id sa8-20020a1709076d0800b0077b0d4fe409mr4037672ejc.744.1663345173724; Fri, 16 Sep 2022 09:19:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663345173; cv=none; d=google.com; s=arc-20160816; b=Jcpf61ZsDUNzGugKSuxArxps/I2APdRlLadjZ1xTesNxnT5gXjeiXT0sYf493Kr+Ho Li81oPB0owGV8xHEAASLbsij4fL7lQ8cwA6u0Ud2y0IzLp2pcYZjXLLDfjs/q0WR3t/L HFfGcfgB+68yRqwBJG7Zi3gF0vdXWFPmC4Njoso98bcGw0qjtv0sgTQTpzBg/kTDMeIR ceguP9XAXsWBfgdTDFZM7roU1sOZX8H0kbm/zhzpwOoSLhlDBtDOtOx2ksC43kEDQaTz jRExvpHOXplG+VLXClWe0zb9O/XToSO0boHCaTCBZVMO9Lsn6rDVqKXuh0HrCecmtAcY LFqA== 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:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=E4nDxyRcoNhVZRzE4+2gUEdTVNbhU3ZW6LH9NQpZw+o=; b=agPNR8U0+I1FUrcxeSrkE/C/tGF8WvjwSGXGOWXPuHR+w6sfXQZSLd1p8OSRi+Z0DP pHkOxr4kBr9H1RAPm6LT1HCpy7uK86/cb92LDu0ap5qByiveKBkiL7Yy0Sy64QUQC1TM QVHAlSwgOLH3eqCVjkEI331RSxFY/XuEW2S+ad8gdOOOAL40wsuNRtonh0E8t96eBAEa qzLx2olu8XHO3IScVmw3Q/xgcl/3gCXzQFFMsmPEsw7k4jYU5In/L12RMr/XyYJ6xsYB +9UeKZvdFn/TIF9JIy6eitM2GQ1xsESAnjmsMTCPvr8lfB20cwbSk1xFz25Ne9+SIl2w d/vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=lfkD7ptY; 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 di18-20020a170906731200b00780aa13b82bsi1369166ejc.383.2022.09.16.09.19.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 09:19:33 -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=lfkD7ptY; 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 99FD1392AC00 for ; Fri, 16 Sep 2022 16:18:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 99FD1392AC00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663345130; bh=E4nDxyRcoNhVZRzE4+2gUEdTVNbhU3ZW6LH9NQpZw+o=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=lfkD7ptYuP/laa9zJe4QkC8Z/irrqajzfJA2tszeWY6+ovifHAP0yKoL1w7sHJxeB eYDspYLNiYnORWSWt+rpyVPZ2XVoLM60Seg4d1BVyKoe1tesYs+b88mY5xcW2ZDcc7 WTWX04S3MHQRJrR4IHtM1WJUAsEmacv7S6CQ9fEo= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id B57A3381559E for ; Fri, 16 Sep 2022 16:18:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B57A3381559E Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-568-4NXj0kY2Pga13tf10qxJXA-1; Fri, 16 Sep 2022 12:18:00 -0400 X-MC-Unique: 4NXj0kY2Pga13tf10qxJXA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3956D80206D; Fri, 16 Sep 2022 16:18:00 +0000 (UTC) Received: from localhost (unknown [10.33.36.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0058D492B04; Fri, 16 Sep 2022 16:17:59 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix Doxygen commands Date: Fri, 16 Sep 2022 17:17:59 +0100 Message-Id: <20220916161759.510516-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 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_LOW, 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?1744143828766763856?= X-GMAIL-MSGID: =?utf-8?q?1744143828766763856?= Tested x86_64-linux, pushed to trunk. -- >8 -- Remove the bogus -D__allocator_base=std::__new_allocator macro definition for Doxygen, because that's an alias template for C++11 and later, not a macro. Fix the @cond/@endcond pair that span the end of an @addtogroup group. Add another @endcond inside the group, and another @cond after it. libstdc++-v3/ChangeLog: * doc/doxygen/user.cfg.in (PREDEFINED): Remove __allocator_base. * include/bits/allocator.h: Fix nesting of Doxygen commands. --- libstdc++-v3/doc/doxygen/user.cfg.in | 1 - libstdc++-v3/include/bits/allocator.h | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/doc/doxygen/user.cfg.in b/libstdc++-v3/doc/doxygen/user.cfg.in index 57270bdeb7a..834ad9e4fd5 100644 --- a/libstdc++-v3/doc/doxygen/user.cfg.in +++ b/libstdc++-v3/doc/doxygen/user.cfg.in @@ -2407,7 +2407,6 @@ PREDEFINED = __cplusplus=202002L \ _GLIBCXX_HAVE_IS_CONSTANT_EVALUATED \ _GLIBCXX_HAVE_BUILTIN_LAUNDER \ "_GLIBCXX_DOXYGEN_ONLY(X)=X " \ - __allocator_base=std::__new_allocator \ __exception_ptr=__unspecified__ \ # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h index aec0b374fd1..28abf13eba9 100644 --- a/libstdc++-v3/include/bits/allocator.h +++ b/libstdc++-v3/include/bits/allocator.h @@ -265,6 +265,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef _Tp value_type; template allocator(const allocator<_Up>&) { } }; + /// @endcond /// @} group allocator @@ -278,6 +279,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Undefine. #undef __allocator_base + /// @cond undocumented + // To implement Option 3 of DR 431. template struct __alloc_swap