From patchwork Thu Apr 25 17:44:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 89005 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EC495384AB53 for ; Thu, 25 Apr 2024 17:45:18 +0000 (GMT) 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 205983860759 for ; Thu, 25 Apr 2024 17:44:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 205983860759 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 205983860759 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714067071; cv=none; b=Du7/ScNK2yzkBXFk2gH8vHT441kSnaU1xTgx+9h1CuRC3YW4expns6P6FaKELgXix7zL67DR6zC3wjt4FQkh4rg62KjqLDqevdmaCnI3XdGabExV27f3isJuxyjrpc88/JktIZ74hETRLQIYCgk7Bn8bBP7ZEextL1GxhZ1bFaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714067071; c=relaxed/simple; bh=4zmjZyMFrIgV10sTPT/GDGFUhX36lQnQHHZjZlEAkeA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=oBu2++eOPFE6xPIfsJafkm3FhcrPs2SUr5NRE8XF+BRMGJ9Hvrs6nSR1E2hM3cMF+QQftoTuH6J92OTrzhjUWmf7uGcT3WOtM7e/1pglhXKhrIWyKcRtIV3hZizFhi52haM6SeatZwkPkKrzuQbzFSIIB1nQLAhi326lEPfqmvo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714067068; 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=kpAenYLkYSWybW7cEqKhazXkTtRJILS0Sq8WUF2TVkU=; b=dFB4To5IwbI4cIh0CipElktuZGAvyFLIerJQr0nyyX85tzSV0+0zn6bIsdhnEnbZ/XfgwC y6QIGDfqycjqSdY5nfOfofhRSa3AdWyH5CzVgvQQL/Zlg76JVC2OUFhKuvsOncv86LMz9Z P6uRWvJEuY4Y61G1iyV4HkdjMVJuHn8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-247-Kzl3UTThNyy5FcISEswX2w-1; Thu, 25 Apr 2024 13:44:25 -0400 X-MC-Unique: Kzl3UTThNyy5FcISEswX2w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4ED6E81B5AF; Thu, 25 Apr 2024 17:44:25 +0000 (UTC) Received: from localhost (unknown [10.42.28.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E39940C6CC1; Thu, 25 Apr 2024 17:44:25 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Update Doxygen config for new headers Date: Thu, 25 Apr 2024 18:44:06 +0100 Message-ID: <20240425174424.2559027-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.4 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, URIBL_BLACK 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Tested x86_64-linux, and docs regenerated. Pushed to trunk. -- >8 -- libstdc++-v3/ChangeLog: * doc/doxygen/stdheader.cc (init_map): Add missing headers. * doc/doxygen/user.cfg.in (EXCLUDE): Exclude generated files for std::format and std::text_encoding. --- libstdc++-v3/doc/doxygen/stdheader.cc | 42 ++++++++++++++++++++------- libstdc++-v3/doc/doxygen/user.cfg.in | 6 ++++ 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/libstdc++-v3/doc/doxygen/stdheader.cc b/libstdc++-v3/doc/doxygen/stdheader.cc index 67f54eef02b..3ee825feb66 100644 --- a/libstdc++-v3/doc/doxygen/stdheader.cc +++ b/libstdc++-v3/doc/doxygen/stdheader.cc @@ -40,19 +40,25 @@ void init_map() headers["ranges_algo.h"] = "algorithm"; headers["ranges_algobase.h"] = "algorithm"; headers["heap.h"] = "algorithm"; + headers["chrono_io.h"] = "chrono"; + headers["parse_numbers.h"] = "chrono"; headers["exception_ptr.h"] = "exception"; headers["nested_exception.h"] = "exception"; headers["fs_dir.h"] = "filesystem"; headers["fs_fwd.h"] = "filesystem"; headers["fs_ops.h"] = "filesystem"; headers["fs_path.h"] = "filesystem"; + headers["unicode.h"] = "format"; + headers["unicode-data.h"] = "format"; headers["binders.h"] = "functional"; headers["function.h"] = "functional"; headers["functional_hash.h"] = "functional"; headers["mofunc_impl.h"] = "functional"; headers["move_only_function.h"] = "functional"; headers["invoke.h"] = "functional"; + headers["ranges_cmp.h"] = "functional"; headers["refwrap.h"] = "functional"; + headers["elements_of.h"] = "generator"; headers["quoted_string.h"] = "iomanip"; headers["ios_base.h"] = "ios"; headers["basic_ios.h"] = "ios"; @@ -64,6 +70,7 @@ void init_map() headers["stream_iterator.h"] = "iterator"; headers["streambuf_iterator.h"] = "iterator"; headers["iterator_concepts.h"] = "iterator"; + headers["max_size_type.h"] = "iterator"; headers["range_access.h"] = "iterator"; headers["codecvt.h"] = "locale"; headers["c++locale.h"] = "locale"; @@ -80,9 +87,11 @@ void init_map() headers["memoryfwd.h"] = "memory"; headers["align.h"] = "memory"; headers["alloc_traits.h"] = "memory"; + headers["allocated_ptr.h"] = "memory"; headers["auto_ptr.h"] = "memory"; headers["construct.h"] = "memory"; headers["allocator.h"] = "memory"; + headers["new_allocator.h"] = "memory"; headers["raw_storage_iter.h"] = "memory"; headers["tempbuf.h"] = "memory"; headers["uninitialized.h"] = "memory"; @@ -94,11 +103,15 @@ void init_map() headers["ptr_traits.h"] = "memory"; headers["uses_allocator.h"] = "memory"; headers["uses_allocator_args.h"] = "memory"; + headers["out_ptr.h"] = "memory"; + headers["memory_resource.h"] = "memory_resource"; headers["unique_lock.h"] = "mutex"; + headers["sat_arith.h"] = "numeric"; + headers["ostream_insert.h"] = "ostream"; headers["uniform_int_dist.h"] = "random"; headers["ranges_base.h"] = "ranges"; + headers["ranges_to.h"] = "ranges"; headers["ranges_util.h"] = "ranges"; - headers["ranges_cmp.h"] = "functional"; headers["regex_automaton.h"] = "regex"; headers["regex_automaton.tcc"] = "regex"; headers["regex_compiler.h"] = "regex"; @@ -122,6 +135,9 @@ void init_map() headers["string_view.tcc"] = "string_view"; headers["this_thread_sleep.h"] = "thread"; headers["tree.h"] = "map"; + headers["hashtable.h"] = "unordered_map"; + headers["hashtable_policy.h"] = "unordered_map"; + headers["move.h"] = "utility"; headers["pair.h"] = "utility"; headers["relops.h"] = "utility"; headers["gslice.h"] = "valarray"; @@ -142,30 +158,34 @@ void init_map() headers["abs.h"] = "cstdlib"; headers["specfun.h"] = "cmath"; - // This list is complete as of the October 2021 working draft. + // This list is complete as of the April 2024 working draft. std_headers = { "algorithm", "any", "array", "atomic", "barrier", "bit", "bitset", "charconv", "chrono", "codecvt", "compare", "complex", "concepts", "condition_variable", "coroutine", - "deque", - "exception", "execution", - "filesystem", "format", "forward_list", "fstream", - "functional", "future", + "debugging", "deque", + "exception", "execution", "expected", + "filesystem", "flat_set", "flat_map", "format", "forward_list", + "fstream", "functional", "future", + "generator", + "hazard_pointer", "initializer_list", "iomanip", "ios", "iosfwd", "iostream", "istream", "iterator", - "latch", "limits", "list", "locale", - "map", "memory", "memory_resource", "mutex", + "latch", "limits", "linalg", "list", "locale", + "map", "mdspan", "memory", "memory_resource", "mutex", "new", "numbers", "numeric", "optional", "ostream", + "print", "queue", - "random", "ranges", "ratio", "regex", + "random", "ranges", "ratio", "rcu", "regex", "scoped_allocator", "semaphore", "set", "shared_mutex", "source_location", "span", "spanstream", "sstream", - "stack", "stacktrace", "stdexcept", "stop_token", + "stack", "stacktrace", "stdexcept", "stdfloat", "stop_token", "streambuf", "string", "string_view", "strstream", "syncstream", "system_error", - "thread", "tuple", "typeindex", "typeinfo", "type_traits", + "text_encoding", "thread", "tuple", "type_traits", + "typeindex", "typeinfo", "unordered_map", "unordered_set", "utility", "valarray", "variant", "vector", "version", diff --git a/libstdc++-v3/doc/doxygen/user.cfg.in b/libstdc++-v3/doc/doxygen/user.cfg.in index 0905e0f48f2..8fe337adf75 100644 --- a/libstdc++-v3/doc/doxygen/user.cfg.in +++ b/libstdc++-v3/doc/doxygen/user.cfg.in @@ -862,9 +862,11 @@ INPUT = @srcdir@/doc/doxygen/doxygroups.cc \ include/expected \ include/filesystem \ include/forward_list \ + include/format \ include/fstream \ include/functional \ include/future \ + include/generator \ include/iomanip \ include/ios \ include/iosfwd \ @@ -883,6 +885,7 @@ INPUT = @srcdir@/doc/doxygen/doxygroups.cc \ include/numbers \ include/optional \ include/ostream \ + include/print \ include/queue \ include/random \ include/ranges \ @@ -1093,6 +1096,9 @@ RECURSIVE = NO # run. EXCLUDE = Makefile \ + include/unicode-data.h \ + include/text_encoding-data.h \ + include/text_encoding-win32.h \ include/experimental/bits/net.h # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or