From patchwork Sat Nov 19 15:08:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 60881 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 627493857C4F for ; Sat, 19 Nov 2022 15:09:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 627493857C4F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668870554; bh=4pUSy5UK5KKaAPtyk1bxk9GumWMPwoNpphEPxj7yoLA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=DB+Pi2zdWNktxk6GYpVQJeE2SAXpauXZopooDMOB4Lc9nJdQ3sKfMMsG6FxsIkklf yDT4clxcSfxHv3pPftQHjFT/ER6AcJy43rnV1n6QBwGB1FPzCzJGk+5qiK0sbSacgW nQh5inPDhvb9x6RgaprTxD0uAVIiK8JNs+5Rg6RQ= 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 5543F38582A1 for ; Sat, 19 Nov 2022 15:08:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5543F38582A1 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-131-pkzK64lWPyuhCEcyMyB5lA-1; Sat, 19 Nov 2022 10:08:43 -0500 X-MC-Unique: pkzK64lWPyuhCEcyMyB5lA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7A67085A5A6; Sat, 19 Nov 2022 15:08:43 +0000 (UTC) Received: from localhost (unknown [10.33.36.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 442D42166B26; Sat, 19 Nov 2022 15:08:43 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix Doxygen warning Date: Sat, 19 Nov 2022 15:08:40 +0000 Message-Id: <20221119150840.1673902-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 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=ham 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-linux. Pushed to trunk. -- >8 -- This fixes a Doxygen warning about a mismatched parameter name. The standard uses 'r' here, like the Doxygen comment, so use '__r' instead of '__e'. libstdc++-v3/ChangeLog: * include/bits/ptr_traits.h (pointer_traits::pointer_to): Rename parameter. --- libstdc++-v3/include/bits/ptr_traits.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/include/bits/ptr_traits.h b/libstdc++-v3/include/bits/ptr_traits.h index 71370ff4fc9..b46a1ac34c9 100644 --- a/libstdc++-v3/include/bits/ptr_traits.h +++ b/libstdc++-v3/include/bits/ptr_traits.h @@ -104,17 +104,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Obtain a pointer to an object * @param __r A reference to an object of type `element_type` - * @return `pointer::pointer_to(__e)` - * @pre `pointer::pointer_to(__e)` is a valid expression. + * @return `pointer::pointer_to(__r)` + * @pre `pointer::pointer_to(__r)` is a valid expression. */ static pointer - pointer_to(element_type& __e) + pointer_to(element_type& __r) #if __cpp_lib_concepts requires requires { - { pointer::pointer_to(__e) } -> convertible_to; + { pointer::pointer_to(__r) } -> convertible_to; } #endif - { return pointer::pointer_to(__e); } + { return pointer::pointer_to(__r); } }; // Do not define pointer_traits

::pointer_to if element type is void.