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.129.124]) by sourceware.org (Postfix) with ESMTPS id BD7533857717 for ; Fri, 28 Apr 2023 12:08:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BD7533857717 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682683683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r0vZF85v76Wf3MXNmQkzzy5fzLrtjqGeRSNXyHiKisA=; b=FKKzXx3TnGubl1J/ogrm4I/cK7HR2H6TTY/npg7UP7QusuXwZpWBO4qrgMn0eeM6vmtiwd u4I8RIAehibG9g6fa/yg+AwrQH/9OxwHAeTFTSxYrEUfAcu+QE7Y8PHe9pDlXYaJG50RCY sGWX2SXJxPzu5ouhjz5glvK68LQ1KiA= 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-401-27Ob0HwuP4Ku-k46VA13lA-1; Fri, 28 Apr 2023 08:08:01 -0400 X-MC-Unique: 27Ob0HwuP4Ku-k46VA13lA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6A1403801FE6; Fri, 28 Apr 2023 12:08:01 +0000 (UTC) Received: from localhost (unknown [10.42.28.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B451C15BA0; Fri, 28 Apr 2023 12:08:01 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Minor fixes to doxygen comments Date: Fri, 28 Apr 2023 13:08:00 +0100 Message-Id: <20230428120800.1906699-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE 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: Tested powerpc64le-linux. Pushed to trunk. -- >8 -- libstdc++-v3/ChangeLog: * include/bits/uses_allocator.h: Add missing @file comment. * include/bits/regex.tcc: Remove stray doxygen comments. * include/experimental/memory_resource: Likewise. * include/std/bit: Tweak doxygen @cond comments. * include/std/expected: Likewise. * include/std/numbers: Likewise. --- libstdc++-v3/include/bits/regex.tcc | 4 ---- libstdc++-v3/include/bits/uses_allocator.h | 5 +++++ libstdc++-v3/include/experimental/memory_resource | 2 -- libstdc++-v3/include/std/bit | 4 ++-- libstdc++-v3/include/std/expected | 4 ++-- libstdc++-v3/include/std/numbers | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/libstdc++-v3/include/bits/regex.tcc b/libstdc++-v3/include/bits/regex.tcc index a58ed3f555f..6f0a486eb04 100644 --- a/libstdc++-v3/include/bits/regex.tcc +++ b/libstdc++-v3/include/bits/regex.tcc @@ -116,8 +116,6 @@ namespace __detail /// @endcond } // namespace __detail - /// @cond - template template typename regex_traits<_Ch_type>::string_type @@ -665,7 +663,5 @@ namespace __detail _M_result = nullptr; } - /// @endcond - _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/include/bits/uses_allocator.h b/libstdc++-v3/include/bits/uses_allocator.h index d1841bbee5d..d3b26c7d974 100644 --- a/libstdc++-v3/include/bits/uses_allocator.h +++ b/libstdc++-v3/include/bits/uses_allocator.h @@ -22,6 +22,11 @@ // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // . +/** @file include/bits/uses_allocator_args.h + * This is an internal header file, included by other library headers. + * Do not attempt to use it directly. @headername{memory} + */ + #ifndef _USES_ALLOCATOR_H #define _USES_ALLOCATOR_H 1 diff --git a/libstdc++-v3/include/experimental/memory_resource b/libstdc++-v3/include/experimental/memory_resource index 070cf791c65..9f1cb42373e 100644 --- a/libstdc++-v3/include/experimental/memory_resource +++ b/libstdc++-v3/include/experimental/memory_resource @@ -45,14 +45,12 @@ #include #include -/// @cond namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION template class malloc_allocator; _GLIBCXX_END_NAMESPACE_VERSION } // namespace __gnu_cxx -/// @endcond namespace std { _GLIBCXX_BEGIN_NAMESPACE_VERSION diff --git a/libstdc++-v3/include/std/bit b/libstdc++-v3/include/std/bit index 0c58971bd59..5eb40218be9 100644 --- a/libstdc++-v3/include/std/bit +++ b/libstdc++-v3/include/std/bit @@ -144,7 +144,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #endif - /// @cond undoc + /// @cond undocumented template constexpr _Tp @@ -374,7 +374,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #define __cpp_lib_bitops 201907L - /// @cond undoc + /// @cond undocumented template using _If_is_unsigned_integer = enable_if_t<__is_unsigned_integer<_Tp>::value, _Up>; diff --git a/libstdc++-v3/include/std/expected b/libstdc++-v3/include/std/expected index 058188248bb..c6d26b0d224 100644 --- a/libstdc++-v3/include/std/expected +++ b/libstdc++-v3/include/std/expected @@ -139,7 +139,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ inline constexpr unexpect_t unexpect{}; -/// @cond undoc +/// @cond undocumented namespace __expected { template @@ -254,7 +254,7 @@ namespace __expected template unexpected(_Er) -> unexpected<_Er>; -/// @cond undoc +/// @cond undocumented namespace __expected { template diff --git a/libstdc++-v3/include/std/numbers b/libstdc++-v3/include/std/numbers index d9d202f5392..d7d9e81e540 100644 --- a/libstdc++-v3/include/std/numbers +++ b/libstdc++-v3/include/std/numbers @@ -49,7 +49,7 @@ namespace numbers { #define __cpp_lib_math_constants 201907L - /// @cond undoc + /// @cond undocumented template using _Enable_if_floating = enable_if_t, _Tp>; /// @endcond -- 2.40.0