diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-11-30 17:29:08 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-11-30 17:29:08 +0000 |
| commit | d44e1abee559935caa783b1987573032a438da3c (patch) | |
| tree | 6b59fc4049766282c76349b4da69092b73095e61 /libstdc++-v3 | |
| parent | 6b590c7a64873d0be0839c661f54276fbbbfded2 (diff) | |
| download | gcc-d44e1abee559935caa783b1987573032a438da3c.zip gcc-d44e1abee559935caa783b1987573032a438da3c.tar.gz gcc-d44e1abee559935caa783b1987573032a438da3c.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 6c7c75f9..e254578 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2017-11-30 Jonathan Wakely <jwakely@redhat.com> + + 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 <glenjofe@gmail.com> * 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 0068cd3..6747a25 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 |