[PATCH] PR libstdc++/65927 Fix -Wunused-but-set-parameter warning

[PATCH] PR libstdc++/65927 Fix -Wunused-but-set-parameter warning

[Jonathan Wakely]

[-- Attachment #1: Type: text/plain, Size: 253 bytes --]

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.


[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 1033 bytes --]

commit 8daeda977638fe99187cd0dbfa363a9755e48e19
Author: Jonathan Wakely <jwakely@redhat.com>
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