svn commit: r619905 - in /stdcxx/branches/4.2.x/src: num_get.cpp num_put.cpp punct.cpp punct.h

[fa...@apache.org]

Author: faridz
Date: Fri Feb  8 07:13:46 2008
New Revision: 619905

URL: http://svn.apache.org/viewvc?rev=619905&view=rev
Log:
2008-02-08 Farid Zaripov <fa...@epam.com>

	Merged r619904 from trunk with a fix for STDCXX-548.
	* src/punct.h: New header file with declaration of the __rw_get_stdio_fmat().
	* src/num_get.cpp: #included punct.h, removed declaration of the __rw_get_stdio_fmat().
	* src/num_put.cpp: Ditto.
	* src/punct.cpp: #included punct.h, use _RWSTD_STREAMSIZE instead of _STD::streamsize.

Added:
    stdcxx/branches/4.2.x/src/punct.h
      - copied unchanged from r619904, stdcxx/trunk/src/punct.h
Modified:
    stdcxx/branches/4.2.x/src/num_get.cpp
    stdcxx/branches/4.2.x/src/num_put.cpp
    stdcxx/branches/4.2.x/src/punct.cpp

Modified: stdcxx/branches/4.2.x/src/num_get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/num_get.cpp?rev=619905&r1=619904&r2=619905&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/num_get.cpp (original)
+++ stdcxx/branches/4.2.x/src/num_get.cpp Fri Feb  8 07:13:46 2008
@@ -31,6 +31,7 @@
 
 #include "setlocale.h"
 #include "strtol.h"
+#include "punct.h"      // for __rw_get_stdio_fmat
 
 #include <ios>          // for ios_base, needed by <rw/_punct.h>
 #include <loc/_num_get.h>
@@ -105,11 +106,6 @@
 #endif   // _RWSTD_NO_LONG_DOUBLE
 
 }   // extern "C"/"C++"
-
-
-const char*
-__rw_get_stdio_fmat (char buf [32], int type, unsigned fmtflags,
-                     _STD::streamsize prec);
 
 
 // verifies that the `grps' array of size `ngrps' representing the

Modified: stdcxx/branches/4.2.x/src/num_put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/num_put.cpp?rev=619905&r1=619904&r2=619905&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/num_put.cpp (original)
+++ stdcxx/branches/4.2.x/src/num_put.cpp Fri Feb  8 07:13:46 2008
@@ -37,6 +37,7 @@
 #include <loc/_num_put.h>
 
 #include "strtol.h"   // for __rw_digit_map
+#include "punct.h"    // for __rw_get_stdio_fmat
 
 
 #ifndef _RWSTD_NO_SNPRINTF
@@ -69,11 +70,6 @@
 static const char __rw_digits[] =
     "0123456789abcdefghijklmnopqrstuvwxyz"
     "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-
-const char*
-__rw_get_stdio_fmat (char buf [32], int type, unsigned fmtflags,
-                     _STD::streamsize prec);
 
 
 #ifdef _RWSTD_LONG_LONG

Modified: stdcxx/branches/4.2.x/src/punct.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/punct.cpp?rev=619905&r1=619904&r2=619905&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/punct.cpp (original)
+++ stdcxx/branches/4.2.x/src/punct.cpp Fri Feb  8 07:13:46 2008
@@ -46,6 +46,7 @@
 #include <rw/_error.h>
 
 #include "setlocale.h"
+#include "punct.h"
 
 
 #if defined (_MSC_VER) && defined (_WIN64)
@@ -599,7 +600,7 @@
 
 const char*
 __rw_get_stdio_fmat (char buf [32], int type, unsigned fmtflags,
-                     _STD::streamsize prec)
+                     _RWSTD_STREAMSIZE prec)
 {
     char *pbuf = buf;