[Cegcc-devel] [commit] libstd++ cleanup some more (time functions).

[Pedro Alves]

Hi all,

My latest mingwex commit enables a bit of cleaning up of libstdc++.
Also, since these functions were currently disabled,
building a libstdc++-6.dll with src/script.sh was broken, as full 
closure was
not possible.
Cheers,
Pedro Alves

---

src/gcc/libstdc++-v3/ChangeLog.ce

2006-10-22  Pedro Alves  <[EMAIL PROTECTED]>

       * config/locale/generic/time_members.cc :
       (__timepunct<char>::_M_put): Enable on __MINGW32CE__.
       (__timepunct<char>::_M_initialize_timepunct) : Likewise.
       (__timepunct<wchar_t>::_M_put) : Likewise.
       (__timepunct<wchar_t>::_M_initialize_timepunct) : Likewise.

Index: config/locale/generic/time_members.cc
===================================================================
--- config/locale/generic/time_members.cc       (revisão 746)
+++ config/locale/generic/time_members.cc       (cópia de trabalho)
@@ -39,7 +39,6 @@
 namespace std
 {
 
-#ifndef __MINGW32CE__
   template<>
     void
     __timepunct<char>::
@@ -50,20 +49,15 @@
       char* __old = strdup(setlocale(LC_ALL, NULL));
       setlocale(LC_ALL, _M_name_timepunct);
 #endif
-#ifndef __MINGW32CE__
       const size_t __len = strftime(__s, __maxlen, __format, __tm);
-#endif
 #ifndef __MINGW32CE__
       setlocale(LC_ALL, __old);
       free(__old);
 #endif
-#ifndef __MINGW32CE__
       // Make sure __s is null terminated.
       if (__len == 0)
        __s[0] = '\0';
-#endif
     }
-#endif
 
   template<> 
     void
@@ -131,23 +125,25 @@
     }
 
 #ifdef _GLIBCXX_USE_WCHAR_T
-#ifndef __MINGW32CE__
   template<>
     void
     __timepunct<wchar_t>::
     _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format, 
           const tm* __tm) const
     {
+#ifndef __MINGW32CE__
       char* __old = strdup(setlocale(LC_ALL, NULL));
       setlocale(LC_ALL, _M_name_timepunct);
+#endif
       const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
+#ifndef __MINGW32CE__
       setlocale(LC_ALL, __old);
       free(__old);
+#endif
       // Make sure __s is null terminated.
       if (__len == 0)
        __s[0] = L'\0';      
     }
-#endif
 
   template<> 
     void
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642_______________________________________________
Cegcc-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/cegcc-devel