You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2008/02/08 16:05:30 UTC

svn commit: r619904 - in /stdcxx/trunk/src: num_get.cpp num_put.cpp punct.cpp punct.h

Author: faridz
Date: Fri Feb  8 07:05:27 2008
New Revision: 619904

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

	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/trunk/src/punct.h   (with props)
Modified:
    stdcxx/trunk/src/num_get.cpp
    stdcxx/trunk/src/num_put.cpp
    stdcxx/trunk/src/punct.cpp

Modified: stdcxx/trunk/src/num_get.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/src/num_get.cpp?rev=619904&r1=619903&r2=619904&view=diff
==============================================================================
--- stdcxx/trunk/src/num_get.cpp (original)
+++ stdcxx/trunk/src/num_get.cpp Fri Feb  8 07:05:27 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/trunk/src/num_put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/src/num_put.cpp?rev=619904&r1=619903&r2=619904&view=diff
==============================================================================
--- stdcxx/trunk/src/num_put.cpp (original)
+++ stdcxx/trunk/src/num_put.cpp Fri Feb  8 07:05:27 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/trunk/src/punct.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/src/punct.cpp?rev=619904&r1=619903&r2=619904&view=diff
==============================================================================
--- stdcxx/trunk/src/punct.cpp (original)
+++ stdcxx/trunk/src/punct.cpp Fri Feb  8 07:05:27 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;
 

Added: stdcxx/trunk/src/punct.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/src/punct.h?rev=619904&view=auto
==============================================================================
--- stdcxx/trunk/src/punct.h (added)
+++ stdcxx/trunk/src/punct.h Fri Feb  8 07:05:27 2008
@@ -0,0 +1,38 @@
+/***************************************************************************
+ *
+ * punct.h - declaration of __rw_get_stdio_fmat()
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <rw/_defs.h>     
+
+
+_RWSTD_NAMESPACE (__rw) {
+
+
+const char*
+__rw_get_stdio_fmat (char buf [32], int type, unsigned fmtflags,
+                     _RWSTD_STREAMSIZE prec);
+
+
+}   // namespace __rw

Propchange: stdcxx/trunk/src/punct.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: stdcxx/trunk/src/punct.h
------------------------------------------------------------------------------
    svn:keywords = Id