From d44e1abee559935caa783b1987573032a438da3c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 30 Nov 2017 17:29:08 +0000 Subject: [PATCH] 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. From-SVN: r255278 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/locale_facets_nonio.h | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6c7c75f98d1..e2545781298 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2017-11-30 Jonathan Wakely + + PR libstdc++/65927 + * include/bits/locale_facets_nonio.h (__timepunct::_M_am_pm_format): + Remove statement with no effect. + 2017-11-30 Glen Joseph Fernandes * include/bits/ptr_traits.h (__to_address, to_address): Move static 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 -- 2.30.2