aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@unitus.it>2002-11-08 18:05:40 +0100
committerPaolo Carlini <paolo@gcc.gnu.org>2002-11-08 17:05:40 +0000
commitbce582242d4393e0c2ad15f97b6df65038f4ca3b (patch)
tree650c67401019c459067061844d666b8f56fceb01
parent8dd3ca88e5deb80930bc143d3ed9ac0c772d6229 (diff)
downloadgcc-bce582242d4393e0c2ad15f97b6df65038f4ca3b.zip
gcc-bce582242d4393e0c2ad15f97b6df65038f4ca3b.tar.gz
gcc-bce582242d4393e0c2ad15f97b6df65038f4ca3b.tar.bz2
monetary_members.cc (moneypunct<wchar_t, [...]): Tweak parameters for glibc2.3 systems, thus avoiding unused parameter warnings.
2002-11-08 Paolo Carlini <pcarlini@unitus.it> * config/locale/gnu/monetary_members.cc (moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale, const char*), moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale, const char*)): Tweak parameters for glibc2.3 systems, thus avoiding unused parameter warnings. From-SVN: r58928
-rw-r--r--libstdc++-v3/ChangeLog9
-rw-r--r--libstdc++-v3/config/locale/gnu/monetary_members.cc10
2 files changed, 18 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b6b5d90..4d80309 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-08 Paolo Carlini <pcarlini@unitus.it>
+
+ * config/locale/gnu/monetary_members.cc
+ (moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale,
+ const char*),
+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale,
+ const char*)): Tweak parameters for glibc2.3 systems, thus
+ avoiding unused parameter warnings.
+
2002-11-05 Jonathan Wakely <cow@compsoc.man.ac.uk>
* include/std/std_sstream.h
diff --git a/libstdc++-v3/config/locale/gnu/monetary_members.cc b/libstdc++-v3/config/locale/gnu/monetary_members.cc
index 0386ab6..17d4d42 100644
--- a/libstdc++-v3/config/locale/gnu/monetary_members.cc
+++ b/libstdc++-v3/config/locale/gnu/monetary_members.cc
@@ -317,7 +317,11 @@ namespace std
template<>
void
moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
+ const char*)
+#else
const char* __name)
+#endif
{
if (!__cloc)
{
@@ -413,8 +417,12 @@ namespace std
template<>
void
- moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
+ const char*)
+#else
const char* __name)
+#endif
{
if (!__cloc)
{