From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19405 invoked by alias); 30 Nov 2017 17:31:00 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 19382 invoked by uid 89); 30 Nov 2017 17:30:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.7 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KB_WAM_FROM_NAME_SINGLEWORD,SPF_HELO_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 30 Nov 2017 17:30:58 +0000 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 97C34C05679B; Thu, 30 Nov 2017 17:30:57 +0000 (UTC) Received: from localhost (unknown [10.33.36.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D339620BB; Thu, 30 Nov 2017 17:30:56 +0000 (UTC) Date: Thu, 30 Nov 2017 17:36:00 -0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] PR libstdc++/65927 Fix -Wunused-but-set-parameter warning Message-ID: <20171130173056.GR31922@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Ublo+h3cBgJ33ahC" Content-Disposition: inline X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.9.1 (2017-09-22) X-SW-Source: 2017-11/txt/msg02600.txt.bz2 --Ublo+h3cBgJ33ahC Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-length: 253 This function doesn't do anything, but we can't remove it as the symbol is exported. PR libstdc++/65927 * include/bits/locale_facets_nonio.h (__timepunct::_M_am_pm_format): Remove statement with no effect. Tested x86_64-linux. Committed to trunk. --Ublo+h3cBgJ33ahC Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-length: 1033 commit 8daeda977638fe99187cd0dbfa363a9755e48e19 Author: Jonathan Wakely Date: Thu Nov 30 16:47:06 2017 +0000 PR libstdc++/65927 Fix -Wunused-but-set-parameter warning PR libstdc++/65927 * include/bits/locale_facets_nonio.h (__timepunct::_M_am_pm_format): Remove statement with no effect. diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.h b/libstdc++-v3/include/bits/locale_facets_nonio.h index 0068cd3addd..6747a25a263 100644 --- a/libstdc++-v3/include/bits/locale_facets_nonio.h +++ b/libstdc++-v3/include/bits/locale_facets_nonio.h @@ -236,9 +236,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __dt[1] = _M_data->_M_date_time_era_format; } +#if !_GLIBCXX_INLINE_VERSION void - _M_am_pm_format(const _CharT* __ampm) const - { __ampm = _M_data->_M_am_pm_format; } + _M_am_pm_format(const _CharT*) const + { /* Kept for ABI compatibility, see PR65927 */ } +#endif void _M_am_pm(const _CharT** __ampm) const --Ublo+h3cBgJ33ahC--