This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Fix recent warning regression


Hi!

Ok to commit the following?

Tested x86-linux.

Ciao, Paolo.

////////////

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.
diff -urN libstdc++-v3-orig/config/locale/gnu/monetary_members.cc libstdc++-v3/config/locale/gnu/monetary_members.cc
--- libstdc++-v3-orig/config/locale/gnu/monetary_members.cc	2002-10-09 01:32:22.000000000 +0200
+++ libstdc++-v3/config/locale/gnu/monetary_members.cc	2002-11-07 19:35:11.000000000 +0100
@@ -317,7 +317,11 @@
   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 @@
 
   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)
 	{

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]