You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2005/09/30 01:00:16 UTC
svn commit: r292573 - in /incubator/stdcxx/trunk: include/loc/_time_put.cc
src/time_put.cpp
Author: sebor
Date: Thu Sep 29 16:00:12 2005
New Revision: 292573
URL: http://svn.apache.org/viewcvs?rev=292573&view=rev
Log:
2005-09-29 Martin Sebor <se...@roguewave.com>
STDCXX-22
* _time_put.cc (__rw_put_time): Changed to an ordinary function.
* time_put.cpp (__rw_put_time): Changed linkage from internal to
external.
Modified:
incubator/stdcxx/trunk/include/loc/_time_put.cc
incubator/stdcxx/trunk/src/time_put.cpp
Modified: incubator/stdcxx/trunk/include/loc/_time_put.cc
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/loc/_time_put.cc?rev=292573&r1=292572&r2=292573&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_time_put.cc (original)
+++ incubator/stdcxx/trunk/include/loc/_time_put.cc Thu Sep 29 16:00:12 2005
@@ -2,7 +2,7 @@
*
* _time_put.cc - definition of std::time_put members
*
- * $Id: //stdlib/dev/include/loc/_time_put.cc#21 $
+ * $Id$
*
***************************************************************************
*
@@ -27,28 +27,19 @@
_RWSTD_NAMESPACE (__rw) {
-template <class _CharT>
-_CharT* __rw_put_time (const __rw_facet*, _CharT*, _RWSTD_SIZE_T,
- _STD::ios_base&, _CharT, const _RWSTD_C::tm*,
- char, char, int, int)
-{
- _RWSTD_ASSERT (!"not implemented");
-
- return 0;
-}
-
-
-_RWSTD_SPECIALIZED_FUNCTION
-char* __rw_put_time (const __rw_facet*, char*, _RWSTD_SIZE_T,
- _STD::ios_base&, char, const _RWSTD_C::tm*,
- char, char, int, int);
+// defined in time_put.cpp
+_RWSTD_EXPORT char*
+__rw_put_time (const __rw_facet*, char*, _RWSTD_SIZE_T,
+ _STD::ios_base&, char, const _RWSTD_C::tm*,
+ char, char, int, int);
#ifndef _RWSTD_NO_WCHAR_T
-_RWSTD_SPECIALIZED_FUNCTION
-wchar_t* __rw_put_time (const __rw_facet*, wchar_t*, _RWSTD_SIZE_T,
- _STD::ios_base&, wchar_t, const _RWSTD_C::tm*,
- char, char, int, int);
+// defined in time_put.cpp
+_RWSTD_EXPORT wchar_t*
+__rw_put_time (const __rw_facet*, wchar_t*, _RWSTD_SIZE_T,
+ _STD::ios_base&, wchar_t, const _RWSTD_C::tm*,
+ char, char, int, int);
#endif // _RWSTD_NO_WCHAR_T
Modified: incubator/stdcxx/trunk/src/time_put.cpp
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/src/time_put.cpp?rev=292573&r1=292572&r2=292573&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/time_put.cpp (original)
+++ incubator/stdcxx/trunk/src/time_put.cpp Thu Sep 29 16:00:12 2005
@@ -122,7 +122,8 @@
__rw_get_timepunct (const _RW::__rw_facet*, int,
const void*[], const _RWSTD_SIZE_T []);
-static char*
+// also declared in _time_put.cc
+_RWSTD_EXPORT char*
__rw_put_time (const __rw_facet*, char*, _RWSTD_SIZE_T,
_STD::ios_base&, char, const tm*,
char, char, int, int);
@@ -130,7 +131,8 @@
#ifndef _RWSTD_NO_WCHAR_T
-static wchar_t*
+// also declared in _time_put.cc
+_RWSTD_EXPORT wchar_t*
__rw_put_time (const __rw_facet*, wchar_t*, _RWSTD_SIZE_T,
_STD::ios_base&, wchar_t, const tm*,
char, char, int, int);
@@ -2567,7 +2569,7 @@
}
-static char*
+_RWSTD_EXPORT char*
__rw_put_time (const __rw_facet *facet, char *buf, _RWSTD_SIZE_T bufsize,
_STD::ios_base &flags, char fill, const tm *tmb,
char fmt, char mod, int width, int prec)
@@ -2669,7 +2671,7 @@
#ifndef _RWSTD_NO_WCHAR_T
-static wchar_t*
+_RWSTD_EXPORT wchar_t*
__rw_put_time (const __rw_facet *facet, wchar_t *wbuf, _RWSTD_SIZE_T bufsize,
_STD::ios_base &flags, wchar_t fill, const tm *tmb,
char fmt, char mod, int width, int prec)