stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r693942 - /stdcxx/branches/4.2.x/src/
Date Wed, 10 Sep 2008 19:28:40 GMT
Author: sebor
Date: Wed Sep 10 12:28:36 2008
New Revision: 693942

URL: http://svn.apache.org/viewvc?rev=693942&view=rev
Log:
2008-09-10  Martin Sebor  <sebor@roguewave.com>

	* src/ctype_bits.cpp: Globally replaced the _RWSTD_SIZE_T macro
	(required to be used in library headers for namespace cleanliness)
	with the standard size_t typedef.
	* src/memory.cpp: Same.
	* src/iostore.cpp: Same.
	* src/bitset.cpp: Same.
	* src/tmpbuf.cpp: Same.
	* src/iso2022.cpp: Same.
	* src/valarray.cpp: Same.
	* src/random.cpp: Same.
	* src/ctype.cpp: Same.
	* src/codecvt.cpp: Same.
	* src/locale_name.cpp: Same.
	* src/time_put.cpp: Same.
	* src/memattr.cpp: Same.
	* src/wctype.cpp: Same.
	* src/facet.cpp: Same.
	* src/locale_eq.cpp: Same.
	* src/strstream.cpp: Same.
	* src/num_put.cpp: Same.
	* src/mman.cpp: Same.
	* src/locale_combine.cpp: Same.

Modified:
    stdcxx/branches/4.2.x/src/bitset.cpp
    stdcxx/branches/4.2.x/src/codecvt.cpp
    stdcxx/branches/4.2.x/src/ctype.cpp
    stdcxx/branches/4.2.x/src/ctype_bits.cpp
    stdcxx/branches/4.2.x/src/facet.cpp
    stdcxx/branches/4.2.x/src/iostore.cpp
    stdcxx/branches/4.2.x/src/iso2022.cpp
    stdcxx/branches/4.2.x/src/locale_combine.cpp
    stdcxx/branches/4.2.x/src/locale_eq.cpp
    stdcxx/branches/4.2.x/src/locale_name.cpp
    stdcxx/branches/4.2.x/src/memattr.cpp
    stdcxx/branches/4.2.x/src/memory.cpp
    stdcxx/branches/4.2.x/src/mman.cpp
    stdcxx/branches/4.2.x/src/num_put.cpp
    stdcxx/branches/4.2.x/src/random.cpp
    stdcxx/branches/4.2.x/src/strstream.cpp
    stdcxx/branches/4.2.x/src/time_put.cpp
    stdcxx/branches/4.2.x/src/tmpbuf.cpp
    stdcxx/branches/4.2.x/src/valarray.cpp
    stdcxx/branches/4.2.x/src/wctype.cpp

Modified: stdcxx/branches/4.2.x/src/bitset.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/bitset.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/bitset.cpp (original)
+++ stdcxx/branches/4.2.x/src/bitset.cpp Wed Sep 10 12:28:36 2008
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2006 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -39,17 +39,17 @@
 _RWSTD_NAMESPACE (__rw) {
 
 #if 2 == _RWSTD_LONG_SIZE
-static const int           __rw_wbasebits =  1;
-static const _RWSTD_SIZE_T __rw_wbasemask = 15;
+static const int    __rw_wbasebits =  1;
+static const size_t __rw_wbasemask = 15;
 #elif 4 == _RWSTD_LONG_SIZE
-static const int           __rw_wbasebits =  2;
-static const _RWSTD_SIZE_T __rw_wbasemask = 31;
+static const int    __rw_wbasebits =  2;
+static const size_t __rw_wbasemask = 31;
 #elif 8 == _RWSTD_LONG_SIZE
-static const int           __rw_wbasebits =  3;
-static const _RWSTD_SIZE_T __rw_wbasemask = 63;
+static const int    __rw_wbasebits =  3;
+static const size_t __rw_wbasemask = 63;
 #else   // assume 16 == sizeof (long)
-static const int           __rw_wbasebits =   4;
-static const _RWSTD_SIZE_T __rw_wbasemask = 127;
+static const int    __rw_wbasebits =   4;
+static const size_t __rw_wbasemask = 127;
 #endif   // _RWSTD_LONG_SIZE
 
 // overloads of __rw_bitset() implement:
@@ -78,10 +78,10 @@
 // -7- If M < N, remaining bit positions are initialized to zero.
 
 _RWSTD_SPECIALIZED_FUNCTION _RWSTD_EXPORT void
-__rw_bitset (unsigned long *bits, _RWSTD_SIZE_T maxbits,
-             const char *str, _RWSTD_SIZE_T slen,
+__rw_bitset (unsigned long *bits, size_t maxbits,
+             const char *str, size_t slen,
              const _STD::char_traits<char>*, char b0, char b1,
-             _RWSTD_SIZE_T pos, _RWSTD_SIZE_T n,
+             size_t pos, size_t n,
              const char *file, const char *fun)
 {
     if (_RWSTD_SIZE_MAX == slen)
@@ -92,15 +92,15 @@
                      (_RWSTD_ERROR_OUT_OF_RANGE, file, fun, pos, slen));
 
     // compute the number of characters in `str' past the offset `pos'
-    const _RWSTD_SIZE_T nchars = n < (slen - pos) ? n : slen - pos;
+    const size_t nchars = n < (slen - pos) ? n : slen - pos;
 
     // compute the number of bits to initialize from `str'
-    const _RWSTD_SIZE_T nbits = nchars < maxbits ? nchars : maxbits;
+    const size_t nbits = nchars < maxbits ? nchars : maxbits;
 
     str += pos;
 
     // compute the number of non-zero bytes occupied by `bits'
-    _RWSTD_SIZE_T nbytes = ((maxbits | 1) >> 3) + (0 != (maxbits & 7));
+    size_t nbytes = ((maxbits | 1) >> 3) + (0 != (maxbits & 7));
 
     // round the number up to a multiple of sizeof(long)
     nbytes = (  (nbytes >> __rw_wbasebits)
@@ -109,11 +109,11 @@
     memset (bits, 0, nbytes);
 
     // set all bits but also check any extra characters as required
-    for (_RWSTD_SIZE_T i = 0; i != nchars; ++i) {
+    for (size_t i = 0; i != nchars; ++i) {
 
         if (b1 == str [i]) {
             if (i < nbits) {
-                const _RWSTD_SIZE_T bitno = nbits - i - 1;
+                const size_t bitno = nbits - i - 1;
 
                 // efficiently compute the value of the expression below
                 // (i.e., without relying on slow division and modulo)
@@ -134,10 +134,10 @@
 #ifndef _RWSTD_NO_WCHAR_T
 
 _RWSTD_SPECIALIZED_FUNCTION _RWSTD_EXPORT void
-__rw_bitset (unsigned long *bits, _RWSTD_SIZE_T maxbits,
-             const wchar_t *str, _RWSTD_SIZE_T slen,
+__rw_bitset (unsigned long *bits, size_t maxbits,
+             const wchar_t *str, size_t slen,
              const _STD::char_traits<wchar_t>*, wchar_t b0, wchar_t b1,
-             _RWSTD_SIZE_T pos, _RWSTD_SIZE_T n,
+             size_t pos, size_t n,
              const char *file, const char *fun)
 {
     if (_RWSTD_SIZE_MAX == slen)
@@ -148,15 +148,15 @@
                      (_RWSTD_ERROR_OUT_OF_RANGE, file, fun, pos, slen));
 
     // compute the number of characters in `str' past the offset `pos'
-    const _RWSTD_SIZE_T nchars = n < (slen - pos) ? n : slen - pos;
+    const size_t nchars = n < (slen - pos) ? n : slen - pos;
 
     // compute the number of bits to initialize from `str'
-    const _RWSTD_SIZE_T nbits = nchars < maxbits ? nchars : maxbits;
+    const size_t nbits = nchars < maxbits ? nchars : maxbits;
 
     str += pos;
 
     // compute the number of non-zero bytes occupied by `bits'
-    _RWSTD_SIZE_T nbytes = ((maxbits | 1) >> 3) + (0 != (maxbits & 7));
+    size_t nbytes = ((maxbits | 1) >> 3) + (0 != (maxbits & 7));
 
     // round the number up to a multiple of sizeof(long)
     nbytes = (  (nbytes >> __rw_wbasebits)
@@ -165,11 +165,11 @@
     memset (bits, 0, nbytes);
 
     // set all bits but also check any extra characters as required
-    for (_RWSTD_SIZE_T i = 0; i != nchars; ++i) {
+    for (size_t i = 0; i != nchars; ++i) {
 
         if (b1 == str [i]) {
             if (i < nbits) {
-                const _RWSTD_SIZE_T bitno = nbits - i - 1;
+                const size_t bitno = nbits - i - 1;
                 bits [bitno >> (3 + __rw_wbasebits)]
                     |= 1UL << (bitno & __rw_wbasemask);
             }
@@ -209,13 +209,13 @@
 
 
 // count the number of 1 bits in bitset `bits' of `size' elements
-_RWSTD_EXPORT _RWSTD_SIZE_T
+_RWSTD_EXPORT size_t
 __rw_bit_count (const unsigned long *bits,
-                _RWSTD_SIZE_T        size) _THROWS (())
+                size_t               size) _THROWS (())
 {
     _RWSTD_ASSERT (0 != bits);
 
-    _RWSTD_SIZE_T sum = 0;
+    size_t sum = 0;
 
     typedef unsigned char UChar;
 
@@ -231,10 +231,9 @@
 
 // shift bitset `bits' of `size' elements left by `n' positions
 _RWSTD_EXPORT void
-__rw_shl (unsigned long *bits,
-          _RWSTD_SIZE_T size, _RWSTD_SIZE_T n) _THROWS (())
+__rw_shl (unsigned long *bits, size_t size, size_t n) _THROWS (())
 {
-    const _RWSTD_SIZE_T wordbits = sizeof *bits * _RWSTD_CHAR_BIT;
+    const size_t wordbits = sizeof *bits * _RWSTD_CHAR_BIT;
 
     if (n >= size * wordbits) {
         memset (bits, 0, size * sizeof *bits);
@@ -244,14 +243,14 @@
     if (!n)
         return;
 
-    const _RWSTD_SIZE_T shlw = n / wordbits;    // word shift left
-    const _RWSTD_SIZE_T shlb = n % wordbits;    // bit shift left
+    const size_t shlw = n / wordbits;    // word shift left
+    const size_t shlb = n % wordbits;    // bit shift left
 
     if (shlb) {
-        const _RWSTD_SIZE_T shrb = wordbits - shlb; // bit shift right
+        const size_t shrb = wordbits - shlb; // bit shift right
 
         // shift one word at a time, spanning word boundaries
-        for (_RWSTD_SIZE_T i = size - 1; i > shlw; --i)
+        for (size_t i = size - 1; i > shlw; --i)
             bits [i] =   bits [i - shlw]     << shlb
                        | bits [i - shlw - 1] >> shrb;
 
@@ -270,10 +269,9 @@
 
 // shift bitset `bits' of `size' elements right by `n' positions
 _RWSTD_EXPORT void
-__rw_shr (unsigned long *bits,
-          _RWSTD_SIZE_T size, _RWSTD_SIZE_T n) _THROWS (())
+__rw_shr (unsigned long *bits, size_t size, size_t n) _THROWS (())
 {
-    const _RWSTD_SIZE_T wordbits = sizeof *bits * _RWSTD_CHAR_BIT;
+    const size_t wordbits = sizeof *bits * _RWSTD_CHAR_BIT;
 
     if (n >= size * wordbits) {
         memset (bits, 0, size * sizeof *bits);
@@ -283,17 +281,17 @@
     if (!n)
         return;
 
-    const _RWSTD_SIZE_T shrw = n / wordbits;    // word shift right
-    const _RWSTD_SIZE_T shrb = n % wordbits;    // bit shift right
+    const size_t shrw = n / wordbits;    // word shift right
+    const size_t shrb = n % wordbits;    // bit shift right
 
     // max word index
-    const _RWSTD_SIZE_T maxw = size - shrw - 1;
+    const size_t maxw = size - shrw - 1;
 
     if (shrb) {
-        const _RWSTD_SIZE_T shlb = wordbits - shrb; // bit shift left
+        const size_t shlb = wordbits - shrb; // bit shift left
 
         // shift one word at a time, spanning word boundaries
-        for (_RWSTD_SIZE_T i = 0; i < maxw;  ++i)
+        for (size_t i = 0; i < maxw;  ++i)
             bits [i] =   bits [i + shrw]     >> shrb
                        | bits [i + shrw + 1] << shlb;
 

Modified: stdcxx/branches/4.2.x/src/codecvt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/codecvt.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/codecvt.cpp (original)
+++ stdcxx/branches/4.2.x/src/codecvt.cpp Wed Sep 10 12:28:36 2008
@@ -152,10 +152,10 @@
     if (always_noconv ())
         return noconv;
 
-    const _RWSTD_SIZE_T nfrom = from_end - from;
-    const _RWSTD_SIZE_T nto   = to_end - to;
+    const size_t nfrom = from_end - from;
+    const size_t nto   = to_end - to;
 
-    const _RWSTD_SIZE_T nconv = nfrom < nto ? nfrom : nto;
+    const size_t nconv = nfrom < nto ? nfrom : nto;
 
     // use memmove() in case ranges overlap
     memmove (to, from, nconv);
@@ -240,7 +240,7 @@
 do_length (state_type        &state,
            const extern_type *from,
            const extern_type *from_end,
-           _RWSTD_SIZE_T      imax) const
+           size_t             imax) const
 {
     // 22.2.1.5.2, p9 - preconditions
     _RWSTD_ASSERT (from <= from_end);
@@ -255,7 +255,7 @@
         return 0;
 
     // 22.2.1.5.2, p10
-    const _RWSTD_SIZE_T len = from_end - from;
+    const size_t len = from_end - from;
     return int (len < imax ? len : imax);
 }
 

Modified: stdcxx/branches/4.2.x/src/ctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/ctype.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/ctype.cpp (original)
+++ stdcxx/branches/4.2.x/src/ctype.cpp Wed Sep 10 12:28:36 2008
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2001-2006 Rogue Wave Software.
+ * Copyright 2001-2006 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -34,7 +34,7 @@
 #include <limits.h>
 #include <locale.h>
 #include <wctype.h>
-#include <string.h>  // for memset()
+#include <string.h>  // for memset(), size_t
 
 #include <loc/_ctype.h>
 #include <loc/_locale.h>
@@ -618,7 +618,7 @@
 
 _RWSTD_EXPORT __rw_facet::_C_ctor_t __rw_ct_ctype;
 
-_RWSTD_EXPORT __rw_facet* __rw_ct_ctype (_RWSTD_SIZE_T ref, const char *name)
+_RWSTD_EXPORT __rw_facet* __rw_ct_ctype (size_t ref, const char *name)
 {
     __rw_facet* pfacet;
 
@@ -658,7 +658,7 @@
 
 
 ctype<char>::
-ctype (const mask *tab, bool del, _RWSTD_SIZE_T refs) _THROWS (())
+ctype (const mask *tab, bool del, size_t refs) _THROWS (())
     : _RW::__rw_facet (refs),
     _C_mask_tab (tab),
     _C_delete_it (del)
@@ -850,7 +850,7 @@
 }
 
 
-ctype_byname<char>::ctype_byname (const char *name, _RWSTD_SIZE_T refs)
+ctype_byname<char>::ctype_byname (const char *name, size_t refs)
     : ctype<char>(0, false, refs)
 {
     _RWSTD_ASSERT (0 != name);

Modified: stdcxx/branches/4.2.x/src/ctype_bits.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/ctype_bits.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/ctype_bits.cpp (original)
+++ stdcxx/branches/4.2.x/src/ctype_bits.cpp Wed Sep 10 12:28:36 2008
@@ -22,16 +22,18 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2006 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
 #define _RWSTD_LIB_SRC
 
 #include <rw/_defs.h>
-
 #include <loc/_ctype.h>
 
+#include <stddef.h>        // for size_t
+
+
 
 _RWSTD_NAMESPACE (std) {
 
@@ -48,7 +50,7 @@
 _RWSTD_DEFINE_STATIC_CONST (const ctype_base::mask ctype_base::alnum);
 _RWSTD_DEFINE_STATIC_CONST (const ctype_base::mask ctype_base::graph);
 
-_RWSTD_DEFINE_STATIC_CONST (const _RWSTD_SIZE_T ctype<char>::table_size);
+_RWSTD_DEFINE_STATIC_CONST (const size_t ctype<char>::table_size);
 
 
 }   // namespace std

Modified: stdcxx/branches/4.2.x/src/facet.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/facet.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/facet.cpp (original)
+++ stdcxx/branches/4.2.x/src/facet.cpp Wed Sep 10 12:28:36 2008
@@ -77,7 +77,7 @@
     };
 
     // find facet's category name
-    for (_RWSTD_SIZE_T i = 0; i != sizeof cats / sizeof *cats; ++i) {
+    for (size_t i = 0; i != sizeof cats / sizeof *cats; ++i) {
         if (category == cats [i].cat)
             return cats [i].name;
     }
@@ -104,7 +104,7 @@
 
 
 
-__rw_facet::__rw_facet (_RWSTD_SIZE_T __ref /* = 0 */) _THROWS (())
+__rw_facet::__rw_facet (size_t __ref /* = 0 */) _THROWS (())
     : _C_name (0), _C_buf (0), _C_impdata (0), _C_impsize (0),
     _C_type (_C_unknown), _C_ref (__ref), _C_pid (0 /* invalid */)
 {
@@ -135,14 +135,14 @@
     // (derived facets may want to set `impdata' to their own,
     // not necessarily memory mapped, data w/o setting `impsize'
     // to something meaningful
-    if ((_RWSTD_SIZE_T)(-1) == _C_impsize)
+    if (size_t (-1) == _C_impsize)
         ::operator delete (_RWSTD_CONST_CAST (void*, _C_impdata));
     else if (_C_impdata && _C_impsize) 
         __rw_release_facet_data (_C_impdata, _C_impsize);
 }
 
 
-void __rw_facet::_C_set_name (const char *name, char *buf, _RWSTD_SIZE_T size)
+void __rw_facet::_C_set_name (const char *name, char *buf, size_t size)
 {
     _RWSTD_ASSERT (0 != name);
     _RWSTD_ASSERT (0 != buf || 0 == size);
@@ -151,7 +151,7 @@
     _RWSTD_ASSERT (0 == _C_name);
     _RWSTD_ASSERT (0 == _C_buf);
 
-    _RWSTD_SIZE_T len = ::strlen (name) + 1;
+    size_t len = strlen (name) + 1;
 
     char *tmp = len <= size ? buf : new char [len];
 
@@ -186,7 +186,7 @@
 
     // implementation database mapping data
     const void* pdata = 0;
-    _RWSTD_SIZE_T sz = 0;
+    size_t sz = 0;
 
     _RWSTD_ASSERT (0 != _C_pid);
     const int cat = __rw_get_cat (int (*_C_pid));
@@ -245,7 +245,7 @@
 
             // set `impsize' to non-zero value to avoid subsequent
             // attempts at reinitialization
-            _C_impsize = (_RWSTD_SIZE_T)-1;
+            _C_impsize = size_t (-1);
             return 0;
         }
 
@@ -358,8 +358,8 @@
     // to hold (pointers to) all standard facets for 8 locales
     static __rw_facet*  std_facet_buf [__rw_facet::_C_last_type * 8];
     static __rw_facet** std_facets = std_facet_buf;
-    static _RWSTD_SIZE_T n_std_facets = 0;
-    static _RWSTD_SIZE_T std_facet_bufsize =
+    static size_t n_std_facets = 0;
+    static size_t std_facet_bufsize =
         sizeof std_facet_buf / sizeof *std_facet_buf;
 
     // acquire lock
@@ -381,7 +381,7 @@
                        sizeof pfacet, &cmpfacets);
         if (pf) {
 
-            const _RWSTD_SIZE_T inx =
+            const size_t inx =
                   _RWSTD_STATIC_CAST (const __rw_facet* const*, pf)
                 - _RWSTD_CONST_CAST (const __rw_facet* const*, std_facets);
 
@@ -389,7 +389,7 @@
 
             if (0 == __rw_locale::_C_remove_ref (*pfacet)) {
 
-                static const _RWSTD_SIZE_T bufsize =
+                static const size_t bufsize =
                     sizeof std_facet_buf / sizeof *std_facet_buf;
 
                 --n_std_facets;
@@ -431,7 +431,7 @@
         else {
 
             // facet is an ordinary (unnamed) standard facet
-            const _RWSTD_SIZE_T ref = __rw_locale::_C_remove_ref (*pfacet);
+            const size_t ref = __rw_locale::_C_remove_ref (*pfacet);
             _RWSTD_ASSERT (ref + 1U != 0);
             _RWSTD_UNUSED (ref);
         }
@@ -485,7 +485,7 @@
 
             // set the facet's numeric id
             *__rw_access::_C_get_pid (*pfacet) =
-                _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, (type + 1) / 2);
+                _RWSTD_STATIC_CAST (size_t, (type + 1) / 2);
 
             if (__rw_access::_C_get_type (*pfacet) != type) {
                 // set the type of the facet if not already set
@@ -517,7 +517,7 @@
 }
 
 
-const void* __rw_get_facet_data (int cat, _RWSTD_SIZE_T &impsize, 
+const void* __rw_get_facet_data (int cat, size_t &impsize, 
                                  const char* name, const char* encoding) 
 {
     if (__rw_facet::_C_use_libc == (__rw_facet::_C_opts & 
@@ -582,7 +582,7 @@
 }
 
 // Its counterpart - does the database unmapping
-void __rw_release_facet_data (const void* pv, _RWSTD_SIZE_T sz) _THROWS (())
+void __rw_release_facet_data (const void* pv, size_t sz) _THROWS (())
 {
     __rw_munmap (pv, sz);
 }
@@ -593,10 +593,10 @@
 // all others (i.e., id's of all user-defined facet types or
 // specializations of standard facets on user-defined types)
 // are in the range (__rw_facet::_C_last_type, ...)
-static _RWSTD_SIZE_T __rw_id_gen = __rw_facet::_C_last_type + 1;
+static size_t __rw_id_gen = __rw_facet::_C_last_type + 1;
 
 
-_RWSTD_SIZE_T __rw_facet_id::_C_init () const _THROWS (())
+size_t __rw_facet_id::_C_init () const _THROWS (())
 {
     // return immediately if already initialized
     if (_C_id)
@@ -607,8 +607,7 @@
     // of standard facets has a chance of completing at the step above
 
     // generate a unique id
-    const _RWSTD_SIZE_T new_id =
-        _RWSTD_ATOMIC_PREINCREMENT (__rw_id_gen, false);
+    const size_t new_id = _RWSTD_ATOMIC_PREINCREMENT (__rw_id_gen, false);
 
 #ifndef _RWSTD_NO_MUTABLE
 

Modified: stdcxx/branches/4.2.x/src/iostore.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/iostore.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/iostore.cpp (original)
+++ stdcxx/branches/4.2.x/src/iostore.cpp Wed Sep 10 12:28:36 2008
@@ -42,19 +42,19 @@
 
 // will grow an array of POD elements, never shrinks
 static void*
-__rw_realloc (void *array, _RWSTD_SIZE_T size, _RWSTD_SIZE_T &n, int inx)
+__rw_realloc (void *array, size_t size, size_t &n, int inx)
 {
     if (inx < 0)
         return 0;   // bad index
 
-    if (_RWSTD_STATIC_CAST (_RWSTD_SIZE_T, inx) < n)
+    if (_RWSTD_STATIC_CAST (size_t, inx) < n)
         return array;   // no need to reallocate
 
     void *tmp;
 
     _TRY {
         // make sure index is dereferencable (cast prevents HP aCC warnings)
-        tmp = operator new (_RWSTD_STATIC_CAST (_RWSTD_SIZE_T, ++inx) * size);
+        tmp = operator new (_RWSTD_STATIC_CAST (size_t, ++inx) * size);
     }
     _CATCH (...) {
         return 0;
@@ -70,7 +70,7 @@
     memset (_RWSTD_STATIC_CAST (char*, tmp) + n * size, 0, (inx - n) * size);
 
     // modify passed-in size
-    n = _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, inx);
+    n = _RWSTD_STATIC_CAST (size_t, inx);
 
     operator delete (array);
 
@@ -100,7 +100,7 @@
         return;
 
     _C_usr_data::_C_event_cb *cba    = _C_usr->_C_cbarray;
-    _RWSTD_SIZE_T             cbsize = _C_usr->_C_cbsize;
+    size_t                    cbsize = _C_usr->_C_cbsize;
 
     // verify consistency (either both are 0 or neither is)
     _RWSTD_ASSERT (!!cba == !!cbsize);
@@ -138,7 +138,7 @@
         }
 
         // 27.4.2.6, p1 - call callbacks in opposite order of registration
-        for (_RWSTD_SIZE_T i = cbsize; i-- > 0; ) {
+        for (size_t i = cbsize; i-- > 0; ) {
 
             _RWSTD_ASSERT (cba && cba [i]._C_fn);
 
@@ -173,8 +173,7 @@
 
 // succeeds irrespective of rdstate()
 void ios_base::
-_C_copyfmt (const ios_base &rhs,
-            void *dst, const void *src, _RWSTD_SIZE_T size)
+_C_copyfmt (const ios_base &rhs, void *dst, const void *src, size_t size)
 {
     if (this == &rhs)
         return;
@@ -186,7 +185,7 @@
     void*   *pa  = 0;
     EventCB *cba = 0;
 
-    _RWSTD_SIZE_T a_size [3];    // sizes of arrays above
+    size_t a_size [3];    // sizes of arrays above
 
     unsigned   fmtfl;    // formatting flags
     streamsize prec;     // new precision
@@ -382,7 +381,7 @@
 
     if (ia) {
         _RWSTD_ASSERT (  _C_usr->_C_isize
-                       > _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, inx));
+                       > _RWSTD_STATIC_CAST (size_t, inx));
 
         return (_C_usr->_C_iarray = ia)[inx];
     }
@@ -412,7 +411,7 @@
 
     if (pa) {
         _RWSTD_ASSERT (  _C_usr->_C_psize
-                       > _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, inx));
+                       > _RWSTD_STATIC_CAST (size_t, inx));
 
         return (_C_usr->_C_parray = pa)[inx];
     }
@@ -438,8 +437,8 @@
 
     typedef _C_usr_data::_C_event_cb EventCB;
 
-    _RWSTD_SIZE_T  sz  = 0;
-    EventCB       *cba = 0;
+    size_t   sz  = 0;
+    EventCB *cba = 0;
 
     if (_C_usr) {
         sz  = _C_usr->_C_cbsize;

Modified: stdcxx/branches/4.2.x/src/iso2022.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/iso2022.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/iso2022.cpp (original)
+++ stdcxx/branches/4.2.x/src/iso2022.cpp Wed Sep 10 12:28:36 2008
@@ -30,7 +30,7 @@
 
 #include <rw/_defs.h>
 
-#include <string.h>     // for strxxx()
+#include <string.h>     // for size_t, strxxx()
 #include <iosfwd>       // for mbstate_t
 
 #include <loc/_codecvt.h>
@@ -166,9 +166,9 @@
 // Database file mappings
 struct __rw_db_map_t
 {
-    const void*   pv;           // pointer to mapping
-    _RWSTD_SIZE_T size;         // size of mapping
-    const char*   name;         // canonical name
+    const void* pv;           // pointer to mapping
+    size_t      size;         // size of mapping
+    const char* name;         // canonical name
 };
 
 
@@ -668,8 +668,8 @@
 {
     // length of a designating sequence in ISO-2022-JP and
     // ISO-2022-JP-2 is 3 or 4 elements
-    _RWSTD_SIZE_T len   = sizeof (ISO_2022_JP_SET_ASCII) - 1U;
-    _RWSTD_SIZE_T sslen = 0;
+    size_t len   = sizeof (ISO_2022_JP_SET_ASCII) - 1U;
+    size_t sslen = 0;
 
     // register designation
     bool g2 = false;
@@ -735,7 +735,7 @@
         // insert the designation
         if (reg != state.g_map [2]) {
             // FIXME - check correctness
-            if (_RWSTD_STATIC_CAST (_RWSTD_SIZE_T, to_end - to) < len)
+            if (_RWSTD_STATIC_CAST (size_t, to_end - to) < len)
                 return CODECVT_PARTIAL;
 
             if (len) {
@@ -751,7 +751,7 @@
 
         // insert the single shift function
         // FIXME - check correctness
-        if (_RWSTD_STATIC_CAST (_RWSTD_SIZE_T, to_end - to) < len)
+        if (_RWSTD_STATIC_CAST (size_t, to_end - to) < len)
             return CODECVT_PARTIAL;
 
         if (sslen) {
@@ -766,7 +766,7 @@
     } else {
 
         // FIXME - check correctness
-        if (_RWSTD_STATIC_CAST (_RWSTD_SIZE_T, to_end - to) < len)
+        if (_RWSTD_STATIC_CAST (size_t, to_end - to) < len)
             return CODECVT_PARTIAL;
 
         if (len) {
@@ -1493,7 +1493,7 @@
     if (from == from_end || to == to_end)
         return CODECVT_OK;
 
-    _RWSTD_SIZE_T ret = __rw_itoutf8 (*from, ptmp);
+    size_t ret = __rw_itoutf8 (*from, ptmp);
 
     unsigned int wc = tbl [UChar (*ptmp)];
     while (wc & 0x80000000) {
@@ -1512,7 +1512,7 @@
     }
 
     // store the encoding sequence at destination
-    _RWSTD_SIZE_T offset = wc + sizeof (_RW::__rw_codecvt_t);
+    size_t offset = wc + sizeof (_RW::__rw_codecvt_t);
     while (impl_raw [offset]) {
         if (to == to_end)
             return CODECVT_PARTIAL;
@@ -1566,7 +1566,7 @@
         const unsigned int* tbl  = tbls;
         _RWSTD_ASSERT(tbls);
 
-        _RWSTD_SIZE_T ret = __rw_itoutf8 (*from, ptmp);
+        size_t ret = __rw_itoutf8 (*from, ptmp);
 
         bool success = true;
         unsigned int wc = tbl [UChar (*ptmp)];
@@ -1587,7 +1587,7 @@
             continue;
 
         // store the encoding sequence at destination
-        _RWSTD_SIZE_T offset = wc + sizeof (_RW::__rw_codecvt_t);
+        size_t offset = wc + sizeof (_RW::__rw_codecvt_t);
         while (impl_raw [offset])
             *to++ = impl_raw [offset++];
 
@@ -1856,10 +1856,10 @@
 }
 
 
-_RWSTD_SIZE_T
+size_t
 __rw_iso2022jp_do_length (_RWSTD_MBSTATE_T& state,
                           const char* from, const char* from_end,
-                          _RWSTD_SIZE_T max)
+                          size_t max)
 {
     _RWSTD_ASSERT(from <= from_end);
 
@@ -1901,7 +1901,7 @@
 }
 
 
-_RWSTD_SIZE_T
+size_t
 __rw_iso2022jp_do_max_length ()
 {
     return 2;
@@ -2076,10 +2076,10 @@
 }
 
 
-_RWSTD_SIZE_T
+size_t
 __rw_iso2022jp2_do_length (_RWSTD_MBSTATE_T& state,
                            const char* from, const char* from_end,
-                           _RWSTD_SIZE_T max)
+                           size_t max)
 {
     _RWSTD_ASSERT(from <= from_end);
 
@@ -2144,7 +2144,7 @@
 }
 
 
-_RWSTD_SIZE_T
+size_t
 __rw_iso2022jp2_do_max_length ()
 {
     return 2;

Modified: stdcxx/branches/4.2.x/src/locale_combine.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/locale_combine.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/locale_combine.cpp (original)
+++ stdcxx/branches/4.2.x/src/locale_combine.cpp Wed Sep 10 12:28:36 2008
@@ -64,7 +64,7 @@
     // `cat' must be a locale::category (and not a LC_XXX value)
     _RWSTD_ASSERT (__rw_locale::_C_check_category (cat));
 
-    for (_RWSTD_SIZE_T i = 0; i != __rw_n_cats; ++i) {
+    for (size_t i = 0; i != __rw_n_cats; ++i) {
         const char *nxt1 = strchr (name_1, *_RWSTD_CAT_SEP);
         const char *nxt2 = strchr (name_2, *_RWSTD_CAT_SEP);
 
@@ -77,8 +77,8 @@
         // convert a LC_XXX constant to a locale::category value
         const int c = __rw_locale::_C_LC2category (__rw_cats [i].cat);
 
-        const char    *from;   // copy from where
-        _RWSTD_SIZE_T  len;    // this many chars
+        const char *from;   // copy from where
+        size_t      len;    // this many chars
 
         if (cat & c) {   // category comes from `other'
             from = name_2;
@@ -122,7 +122,7 @@
     // and fixed in __rw_locale::__rw_locale, but related to the use of
     // memcpy.
 
-    for(_RWSTD_SIZE_T i = 0; i != _C_n_std_facets; i++)
+    for (size_t i = 0; i != _C_n_std_facets; i++)
         _C_std_facets [i] = rhs._C_std_facets [i];
 
 #endif   // i86/gcc 3.x
@@ -130,8 +130,8 @@
     _RWSTD_ASSERT (!pfacet || pfacet->_C_pid);
 
     // get facet's index into one of the facet arrays
-    _RWSTD_SIZE_T inx = pfacet
-        ? rhs._C_get_facet_inx (*pfacet->_C_pid) : (_RWSTD_SIZE_T)(-1);
+    size_t inx = pfacet
+        ? rhs._C_get_facet_inx (*pfacet->_C_pid) : size_t (-1);
 
     // extend size if facet isn't installed in `rhs'
     _C_n_usr_facets =   rhs._C_n_usr_facets
@@ -158,7 +158,7 @@
         if (inx < _C_n_std_facets) {
             _C_std_facets [inx] = pf;
 
-            const _RWSTD_SIZE_T facet_bit = 1UL << inx;
+            const size_t facet_bit = 1UL << inx;
 
             // set or clear a corresponding bit based on whether
             // the facet is one of the standard facets or not
@@ -179,7 +179,7 @@
             // _C_name =
             //     _C_make_name (_C_namebuf, sizeof _C_namebuf, rhs, *pfacet);
         }
-        else if ((_RWSTD_SIZE_T)(-1) == inx)
+        else if (size_t (-1) == inx)
             _C_usr_facets [_C_n_usr_facets - 1] = pf;
         else
             _C_usr_facets [inx - _C_n_std_facets] = pf;
@@ -187,7 +187,7 @@
 
     if (!_C_name) {
         // simply copy name from `rhs'
-        const _RWSTD_SIZE_T size = strlen (rhs._C_name) + 1;
+        const size_t size = strlen (rhs._C_name) + 1;
         char* const name = size <= sizeof _C_namebuf
             ? _C_namebuf : new char [size];
 
@@ -241,7 +241,7 @@
     _C_byname_facet_bits =   one._C_byname_facet_bits & ~bits
                            | other._C_byname_facet_bits & bits;
 
-    for (_RWSTD_SIZE_T i = 0; i != _C_n_std_facets; ++i) {
+    for (size_t i = 0; i != _C_n_std_facets; ++i) {
 
         // each facet is stored at an index equal to its (id - 1)
         // convert an LC_XXX constant to a locale::category value
@@ -260,7 +260,7 @@
     }
 
     // increment the ref count of user-defined facets (if any)
-    for (_RWSTD_SIZE_T j = 0; j != _C_n_usr_facets; ++j) {
+    for (size_t j = 0; j != _C_n_usr_facets; ++j) {
 
         _RWSTD_ASSERT (_C_usr_facets [j]);
 
@@ -314,8 +314,7 @@
         // compute the number of the bit in _C_std_facet_bits or
         //_C_byname_facet_bits corresponding to the facet being
         // used (i.e., `*pfacet')
-        const _RWSTD_SIZE_T facet_bit =
-            (_RWSTD_SIZE_T)1U << (*pfacet->_C_pid - 1U);
+        const size_t facet_bit = size_t (1U) << (*pfacet->_C_pid - 1U);
 
         // a locale object is globally managed if all its facets are objects
         // of standard facet types (ordinary or byname) that were constructed
@@ -345,8 +344,7 @@
             const int cat_bits = _C_LC2facet_bits (facet_cat);
 
             // get the index into the _C_std_facets array for `pfacet'
-            const _RWSTD_SIZE_T facet_inx =
-                _C_get_facet_inx (*pfacet->_C_pid);
+            const size_t facet_inx = _C_get_facet_inx (*pfacet->_C_pid);
 
             managed = true;
 
@@ -356,7 +354,7 @@
             // _byname facets that are not installed yet (i.e., whose
             // pointers are 0 come from a locale whose name is given
             // by the name of the whole locale
-            for (_RWSTD_SIZE_T i = 0; i != _C_n_std_facets; ++i) {
+            for (size_t i = 0; i != _C_n_std_facets; ++i) {
 
                 // skip facets from other categories
                 if (!((1 << i) & cat_bits))
@@ -517,7 +515,7 @@
             // a match; if found, remember its position (duplicates
             // are not allowed)
 
-            for (_RWSTD_SIZE_T i = 0; i != __rw_n_cats; ++i) {
+            for (size_t i = 0; i != __rw_n_cats; ++i) {
                 if (!strncmp (__rw_cats [i].name, s, endcat - s)) {
                     if (pcatnames [i])
                         return 0;    // error: duplicate LC_XXX
@@ -533,8 +531,8 @@
         }
 
         // compose a normalized locale name out of category names
-        _RWSTD_SIZE_T size = 0;
-        for (_RWSTD_SIZE_T i = 0; i != __rw_n_cats; ++i) {
+        size_t size = 0;
+        for (size_t i = 0; i != __rw_n_cats; ++i) {
 
             if (!pcatnames [i]) {
                 // use "C" for missing LC_XXX values
@@ -546,7 +544,7 @@
             if (!endcat)
                 endcat = pcatnames [i] + strlen (pcatnames [i]);
 
-            const _RWSTD_SIZE_T catsize = endcat - pcatnames [i];
+            const size_t catsize = endcat - pcatnames [i];
 
             // append name followed by the libc "native" separator
             realname.append (pcatnames [i], catsize);
@@ -706,8 +704,8 @@
     _RWSTD_ASSERT (0 != _C_body);
 
     // find the index at which the facet is stored in one of the facet arrays
-    const _RWSTD_SIZE_T inx = _C_body->_C_get_facet_inx (fid._C_id);
-    if ((_RWSTD_SIZE_T)(-1) == inx)
+    const size_t inx = _C_body->_C_get_facet_inx (fid._C_id);
+    if (size_t (-1) == inx)
         return 0;
 
     const locale::facet* const pfacet = inx < _RW::__rw_locale::_C_n_std_facets

Modified: stdcxx/branches/4.2.x/src/locale_eq.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/locale_eq.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/locale_eq.cpp (original)
+++ stdcxx/branches/4.2.x/src/locale_eq.cpp Wed Sep 10 12:28:36 2008
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2006 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -118,7 +118,7 @@
 
     // locales with the same (non-0) number of user-defined
     // facets compare equal iff all the facets are identical
-    for (_RWSTD_SIZE_T i = 0; i != _C_body->_C_n_usr_facets; ++i) {
+    for (size_t i = 0; i != _C_body->_C_n_usr_facets; ++i) {
 
         const _RW::__rw_facet* const pf = _C_body->_C_usr_facets [i];
 

Modified: stdcxx/branches/4.2.x/src/locale_name.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/locale_name.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/locale_name.cpp (original)
+++ stdcxx/branches/4.2.x/src/locale_name.cpp Wed Sep 10 12:28:36 2008
@@ -31,12 +31,14 @@
 #include <rw/_defs.h>
 
 #include <new>
-#include <string.h>
+#include <string.h>      // for size_t, strchr(), strlen()
 
 #include <loc/_facet.h>
 #include <loc/_locale.h>
 
 #include "locale_body.h"
+#include "setlocale.h"   // for __rw_cats
+
 
 #if 6 == _RWSTD_HP_aCC_MAJOR && _RWSTD_HP_aCC_MINOR <= 1600
    // silence bogus HP aCC 6.16/cadvise warning #20200-D:
@@ -68,7 +70,7 @@
 
         string result;
 
-        _RWSTD_SIZE_T i = 0;
+        size_t i = 0;
 
         for (const char *catnm = _C_body->_C_name; *catnm; ) {
 

Modified: stdcxx/branches/4.2.x/src/memattr.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/memattr.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/memattr.cpp (original)
+++ stdcxx/branches/4.2.x/src/memattr.cpp Wed Sep 10 12:28:36 2008
@@ -30,7 +30,7 @@
 #define _RWSTD_LIB_SRC
 
 #include <errno.h>    // for ENOMEM, errno
-#include <string.h>   // for memchr
+#include <string.h>   // for memchr(), size_t
 
 #ifndef EFAULT
 #  define EFAULT  14   // Linux value
@@ -97,7 +97,7 @@
 _RWSTD_NAMESPACE (__rw) {
 
 _RWSTD_EXPORT _RWSTD_SSIZE_T
-__rw_memattr (const void *addr, _RWSTD_SIZE_T nbytes, int attr)
+__rw_memattr (const void *addr, size_t nbytes, int attr)
 {
     // FIXME: allow attr to be set to the equivalent of PROT_READ,
     // PROT_WRITE, and (perhaps also) PROT_EXEC, or any combination
@@ -109,19 +109,19 @@
     const int errno_save = errno;
 
     // determine the system page size in bytes
-    static const _RWSTD_SIZE_T pgsz = size_t (GETPAGESIZE ());
+    static const size_t pgsz = size_t (GETPAGESIZE ());
 
     // compute the address of the beginning of the page
     // to which the address `addr' belongs
     caddr_t const page =
         _RWSTD_REINTERPRET_CAST (caddr_t,
-            _RWSTD_REINTERPRET_CAST (_RWSTD_SIZE_T, addr) & ~(pgsz - 1));
+            _RWSTD_REINTERPRET_CAST (size_t, addr) & ~(pgsz - 1));
 
     // compute the maximum number of pages occuppied by the memory
     // region pointed to by `addr' (nbytes may be -1 as a request
     // to compute, in a safe way, the length of the string pointed
     // to by `addr')
-    _RWSTD_SIZE_T npages = nbytes ? nbytes / pgsz + 1 : 0;
+    size_t npages = nbytes ? nbytes / pgsz + 1 : 0;
 
     for (size_t i = 0; i < npages; ++i) {
 
@@ -216,7 +216,7 @@
             // be safe since the first byte of the range has
             // been determined to be readable
 
-            const _RWSTD_SIZE_T maxpage =
+            const size_t maxpage =
                 next == page ? pgsz - DIST (addr, next) : pgsz;
 
             const void* const pnul =

Modified: stdcxx/branches/4.2.x/src/memory.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/memory.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/memory.cpp (original)
+++ stdcxx/branches/4.2.x/src/memory.cpp Wed Sep 10 12:28:36 2008
@@ -23,7 +23,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2006 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -33,7 +33,7 @@
 #include <rw/_mutex.h>
 
 #include <new>
-#include <stdlib.h>
+#include <stdlib.h>   // for free(), malloc(), size_t
 
 #include <rw/_defs.h>
 
@@ -42,7 +42,7 @@
 
 
 _RWSTD_EXPORT void*
-__rw_allocate (_RWSTD_SIZE_T nbytes, int /* = 0 */)
+__rw_allocate (size_t nbytes, int /* = 0 */)
 {
     void *ptr = 0;
 
@@ -57,7 +57,7 @@
         // operator new() doesn't check for argument overflow,
         // check before calling it and fail if `n' looks too big
 
-        if (nbytes < (_RWSTD_SIZE_T)-1 - 256)
+        if (nbytes < size_t (-1) - 256)
             ptr = ::operator new (nbytes);
 
 #endif   // _RWSTD_NO_NEW_OFLOW_SAFE
@@ -76,7 +76,7 @@
 
 
 _RWSTD_EXPORT void
-__rw_deallocate (void *p, _RWSTD_SIZE_T, int /* = 0 */) _THROWS (())
+__rw_deallocate (void *p, size_t, int /* = 0 */) _THROWS (())
 {
     ::operator delete (p);
 }
@@ -104,7 +104,7 @@
 #  ifdef _RWSTD_NO_OPERATOR_NEW_NOTHROW
 
 _RWSTD_EXPORT void*
-operator new (_RWSTD_SIZE_T __size, const _STD::nothrow_t&) _NEW_THROWS (())
+operator new (size_t __size, const _STD::nothrow_t&) _NEW_THROWS (())
 {
     return malloc (__size);
 }
@@ -126,7 +126,7 @@
 #  ifdef _RWSTD_NO_OPERATOR_NEW_ARRAY
 
 _RWSTD_EXPORT void*
-operator new[] (_RWSTD_SIZE_T __size) _NEW_THROWS ((_RWSTD_BAD_ALLOC))
+operator new[] (size_t __size) _NEW_THROWS ((_RWSTD_BAD_ALLOC))
 {
     return ::operator new (__size);
 }
@@ -136,7 +136,7 @@
 #  ifdef _RWSTD_NO_OPERATOR_NEW_ARRAY_NOTHROW
 
 _RWSTD_EXPORT void*
-operator new[] (_RWSTD_SIZE_T __size, const _STD::nothrow_t&) _NEW_THROWS (())
+operator new[] (size_t __size, const _STD::nothrow_t&) _NEW_THROWS (())
 {
     _TRY {
         return ::operator new (__size);
@@ -178,7 +178,7 @@
 
 #ifdef _MSC_VER
 
-typedef int (*__rw_new_handler_t)(_RWSTD_SIZE_T);
+typedef int (*__rw_new_handler_t)(size_t);
 
 _RWSTD_DLLIMPORT __rw_new_handler_t _set_new_handler (__rw_new_handler_t);
 
@@ -186,7 +186,7 @@
 
 static _STD::new_handler __rw_new_handler /* = 0 */;
 
-static int __rw_new_handler_imp (_RWSTD_SIZE_T)
+static int __rw_new_handler_imp (size_t)
 {
     _RWSTD_ASSERT (0 != __rw_new_handler);
 

Modified: stdcxx/branches/4.2.x/src/mman.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/mman.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/mman.cpp (original)
+++ stdcxx/branches/4.2.x/src/mman.cpp Wed Sep 10 12:28:36 2008
@@ -45,7 +45,7 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#include <stdlib.h>
+#include <stdlib.h>       // for size_t
 
 
 _RWSTD_NAMESPACE (__rw) {
@@ -54,7 +54,7 @@
 // maps a named file into memory as shared, read-only, returns
 // the beginning address on success and fills `size' with the
 // size of the file; returns 0 on failure
-void* __rw_mmap (const char* fname, _RWSTD_SIZE_T *size)   // nothrow
+void* __rw_mmap (const char* fname, size_t *size)   // nothrow
 {
     _RWSTD_ASSERT (0 != fname);
     _RWSTD_ASSERT (0 != size);
@@ -147,7 +147,7 @@
 }
 
 
-void __rw_munmap (const void* pcv, _RWSTD_SIZE_T size)   // nothrow
+void __rw_munmap (const void* pcv, size_t size)   // nothrow
 {
     _RWSTD_ASSERT (pcv && size);
 

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=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/num_put.cpp (original)
+++ stdcxx/branches/4.2.x/src/num_put.cpp Wed Sep 10 12:28:36 2008
@@ -57,7 +57,7 @@
 extern "C" {
 
 _RWSTD_DLLIMPORT int
-snprintf (char*, _RWSTD_SIZE_T, const char*, ...) _LIBC_THROWS ();
+snprintf (char*, size_t, const char*, ...) _LIBC_THROWS ();
 
 }   // extern "C"
 
@@ -131,12 +131,12 @@
 typedef unsigned _RWSTD_LONG_LONG _ULLong;
 
 
-static _RWSTD_SIZE_T
+static size_t
 __rw_btoa (char *buf, _ULLong i, unsigned base)
 {
     _RWSTD_ASSERT (base && base <= 36);
 
-    const _RWSTD_SIZE_T dig = _STD::numeric_limits<_ULLong>::digits + 0U;
+    const size_t dig = _STD::numeric_limits<_ULLong>::digits + 0U;
 
     char*             end   = buf + dig;
     const char* const begin = end;
@@ -151,7 +151,7 @@
         *--end = __rw_digits [i - tmp * base];
     } while ((i = tmp));
 
-    const _RWSTD_SIZE_T len = begin - end;
+    const size_t len = begin - end;
 
    memmove (buf, end, len);
 
@@ -159,12 +159,12 @@
 }
 
 
-static _RWSTD_SIZE_T
+static size_t
 __rw_dtoa (char *buf, _ULLong i, unsigned flags)
 {
     // get the maximum number of decimal digits for an unsigned long
     // with the largest magnitude, plus 1 for the (optional) sign
-    const _RWSTD_SIZE_T dig10 = _STD::numeric_limits<_ULLong>::digits10 + 2U;
+    const size_t dig10 = _STD::numeric_limits<_ULLong>::digits10 + 2U;
 
     char*             end   = buf + dig10;
     const char* const begin = end;
@@ -183,7 +183,7 @@
     if (flags & _RWSTD_IOS_SHOWPOS)
         *--end = '+';
 
-    const _RWSTD_SIZE_T len = begin - end;
+    const size_t len = begin - end;
 
    memmove (buf, end, len);
 
@@ -191,7 +191,7 @@
 }
 
 
-static inline _RWSTD_SIZE_T
+static inline size_t
 __rw_dtoa (char *buf, _LLong i, unsigned flags)
 {
     if (i < 0) {
@@ -204,7 +204,7 @@
 }
 
 
-static _RWSTD_SIZE_T
+static size_t
 __rw_itoa (char *buf, _ULLong i, unsigned flags)
 {
     const char* const pdigs = flags & _RWSTD_IOS_UPPERCASE ?
@@ -271,7 +271,7 @@
 }
 
 
-static inline _RWSTD_SIZE_T
+static inline size_t
 __rw_itoa (char *buf, _LLong i, unsigned flags)
 {
     if (10 == flags >> _RWSTD_IOS_BASEOFF)
@@ -284,12 +284,12 @@
 #endif   // _RWSTD_LONG_LONG
 
 
-static _RWSTD_SIZE_T
+static size_t
 __rw_btoa (char *buf, unsigned long i, unsigned base)
 {
     _RWSTD_ASSERT (base && base <= 36);
 
-    const _RWSTD_SIZE_T dig = _STD::numeric_limits<unsigned long>::digits + 0U;
+    const size_t dig = _STD::numeric_limits<unsigned long>::digits + 0U;
 
     char*             end   = buf + dig;
     const char* const begin = end;
@@ -304,7 +304,7 @@
         *--end = __rw_digits [i - tmp * base];
     } while ((i = tmp));
 
-    const _RWSTD_SIZE_T len = begin - end;
+    const size_t len = begin - end;
 
    memmove (buf, end, len);
 
@@ -312,12 +312,12 @@
 }
 
 
-static  inline _RWSTD_SIZE_T
+static  inline size_t
 __rw_dtoa (char *buf, unsigned long i, unsigned flags)
 {
     // get the maximum number of decimal digits for an unsigned long
     // with the largest magnitude, plus 1 for the (optional) sign
-    const _RWSTD_SIZE_T dig10 =
+    const size_t dig10 =
         _STD::numeric_limits<unsigned long>::digits10 + 2U;
 
     char*             end   = buf + dig10;
@@ -339,7 +339,7 @@
         *--end = '+';
 
     // move the contents of the buffer to the beginning
-    const _RWSTD_SIZE_T len = begin - end;
+    const size_t len = begin - end;
 
    memmove (buf, end, len);
 
@@ -347,7 +347,7 @@
 }
 
 
-static inline _RWSTD_SIZE_T
+static inline size_t
 __rw_dtoa (char *buf, long i, unsigned flags)
 {
     if (i < 0) {
@@ -362,7 +362,7 @@
 
 
 // convert unsigned long to a roman number
-static _RWSTD_SIZE_T
+static size_t
 __rw_utor (char *buf, unsigned long i, unsigned flags)
 {
     //                          01234560123456
@@ -407,7 +407,7 @@
 }
 
 
-static _RWSTD_SIZE_T
+static size_t
 __rw_itoa (char *buf, unsigned long i, unsigned flags)
 {
     const char* const pdigs = flags & _RWSTD_IOS_UPPERCASE ?
@@ -474,7 +474,7 @@
 }
 
 
-static inline _RWSTD_SIZE_T
+static inline size_t
 __rw_itoa (char *buf, long i, unsigned flags)
 {
     if (10 == flags >> _RWSTD_IOS_BASEOFF)
@@ -484,8 +484,8 @@
 }
 
 
-_RWSTD_EXPORT _RWSTD_SIZE_T
-__rw_put_groups (char **pbuf, _RWSTD_SIZE_T len, _RWSTD_SIZE_T bufsize,
+_RWSTD_EXPORT size_t
+__rw_put_groups (char **pbuf, size_t len, size_t bufsize,
                  const char *end, const char *grouping)
 {
     _RWSTD_ASSERT (0 != *pbuf);
@@ -523,8 +523,8 @@
             ++pd;
     }
 
-    _RWSTD_SIZE_T ngrps  = 0;   // number of complete groups
-    _RWSTD_SIZE_T grplen = 0;   // length of complete groups
+    size_t ngrps  = 0;   // number of complete groups
+    size_t grplen = 0;   // length of complete groups
 
     // compute the amount of buffer space needed for group separators
     const char *pg = grouping;
@@ -543,7 +543,7 @@
         else
             ++pg;
 
-        if (grplen + grp >= _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, end - pd))
+        if (grplen + grp >= _RWSTD_STATIC_CAST (size_t, end - pd))
             break;
 
         grplen += grp;
@@ -568,7 +568,7 @@
             *pd = pd [-_RWSTD_STATIC_CAST (_RWSTD_PTRDIFF_T, ngrps)];
         }
         else {
-            if ((_RWSTD_SIZE_T)(end - pd) == grplen + 1) {
+            if (size_t (end - pd) == grplen + 1) {
                 // insert throusands separator and compute
                 // the offset of the next separator
                 *pd = ';';
@@ -615,7 +615,7 @@
 
 
 static inline void
-__rw_fix_flt (char *&end, _RWSTD_SIZE_T &len,
+__rw_fix_flt (char *&end, size_t &len,
               unsigned flags, _RWSTD_STREAMSIZE prec)
 {
 #ifdef _WIN32
@@ -635,7 +635,7 @@
         for (ptr = beg + 2; ptr != end && '0' == *ptr; ++ptr) ;
 
         if (ptr == end) {
-            const _RWSTD_SIZE_T exp_len =
+            const size_t exp_len =
                 0 > prec ? 7 : (1 < prec ? prec + 1 : 2);
             if (exp_len < len) {
                 end = beg + exp_len;
@@ -774,8 +774,8 @@
 
 
 
-_RWSTD_EXPORT _RWSTD_SIZE_T
-__rw_put_num (char **pbuf, _RWSTD_SIZE_T bufsize,
+_RWSTD_EXPORT size_t
+__rw_put_num (char **pbuf, size_t bufsize,
               unsigned flags, int type, _RWSTD_STREAMSIZE prec,
               const void *pval, const char *grouping)
 {
@@ -783,11 +783,9 @@
     const char       *fmt = 0;       // stdio format specifier
     char* const       buf = *pbuf;   // saved value of *pbuf
     char             *end = 0;       // decimal point
-    _RWSTD_SIZE_T     len;           // length of formatted number
+    size_t            len;           // length of formatted number
     _RWSTD_STREAMSIZE fpr;           // special case floating point precision
 
-    typedef _RWSTD_SIZE_T SizeT;
-
     switch (type) {
 
     case __rw_facet::_C_bool:
@@ -853,7 +851,7 @@
                 fmt = __rw_get_stdio_fmat (fmtbuf, type & ~__rw_facet::_C_ptr,
                                            flags, fpr);
                 for (; ;) {
-                    len = SizeT (_SNPRINTF (*pbuf, bufsize, fmt, fval));
+                    len = size_t (_SNPRINTF (*pbuf, bufsize, fmt, fval));
 
                     if (len >= bufsize) {
                         if (*pbuf != buf)
@@ -889,7 +887,7 @@
                                            flags, fpr);
 
                 for ( ; ; ) {
-                    len = SizeT (_SNPRINTF (*pbuf, bufsize, fmt, dval));
+                    len = size_t (_SNPRINTF (*pbuf, bufsize, fmt, dval));
 
                     if (len >= bufsize) {
                         if (*pbuf != buf)
@@ -927,7 +925,7 @@
                                            flags, fpr);
 
                 for ( ; ; ) {
-                    len = SizeT (_SNPRINTF (*pbuf, bufsize, fmt, ldval));
+                    len = size_t (_SNPRINTF (*pbuf, bufsize, fmt, ldval));
                     if (len >= bufsize) {
                         if (*pbuf != buf)
                             delete[] *pbuf;
@@ -955,7 +953,7 @@
     case __rw_facet::_C_pvoid:
         if (pval) {
             fmt = __rw_get_stdio_fmat (fmtbuf, type, flags, prec);
-            len = SizeT (_SNPRINTF (buf, bufsize, fmt, pval));
+            len = size_t (_SNPRINTF (buf, bufsize, fmt, pval));
         }
         else {
             // prevent GNU libc from formatting null pointers as "(nil)"
@@ -988,8 +986,8 @@
 
         const _RWSTD_PTRDIFF_T ndigs = len - sign;
 
-        _RWSTD_SIZE_T nfill;   // the number of 0's to insert
-        _RWSTD_SIZE_T nmove;   // the number of digits to move
+        size_t nfill;   // the number of 0's to insert
+        size_t nmove;   // the number of digits to move
 
         if (-prec >= ndigs) {
 
@@ -1012,7 +1010,7 @@
             // e.g., "1234" with prec == -3 yields "1.234"
 
             nfill = 0;
-            nmove = SizeT (-prec);
+            nmove = size_t (-prec);
 
             src = beg + (ndigs + prec);
             dst = src + 1;

Modified: stdcxx/branches/4.2.x/src/random.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/random.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/random.cpp (original)
+++ stdcxx/branches/4.2.x/src/random.cpp Wed Sep 10 12:28:36 2008
@@ -35,7 +35,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2006 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -61,7 +61,7 @@
 
 // generator may produces a different sequence of random numbers
 // on different architectures (depending on the width of size_t)
-typedef _RWSTD_SIZE_T __rw_random_t;
+typedef size_t __rw_random_t;
 
 #endif   // _RWSTD_NO_EXT_PORTABLE_RANDOM_SEQUENCE
 
@@ -81,19 +81,19 @@
 {
     __rw_table [__rw_table_size - 1] = seed;
 
-    _RWSTD_SIZE_T i;
+    size_t i;
 
     __rw_random_t k = 1;
 
     for (i = 0; i != __rw_table_size - 1; ++i) {
-        const _RWSTD_SIZE_T ii = 21U * i % __rw_table_size;
+        const size_t ii = 21U * i % __rw_table_size;
         __rw_table [ii] = k;
         k               = seed - k;
         seed            = __rw_table [ii];
     }
 
     for (i = 0; i != 4U; ++i) {
-        for (_RWSTD_SIZE_T ii = 0; ii != __rw_table_size; ++ii)
+        for (size_t ii = 0; ii != __rw_table_size; ++ii)
             __rw_table [i] =
                 __rw_table [i] - __rw_table [(i + 31U) % __rw_table_size];
     }
@@ -105,8 +105,8 @@
 
 struct _RandGuardT;
 
-_RWSTD_EXPORT _RWSTD_SIZE_T
-__rw_rand (_RWSTD_SIZE_T limit)
+_RWSTD_EXPORT size_t
+__rw_rand (size_t limit)
 {
     _RWSTD_ASSERT (0 != limit);
 

Modified: stdcxx/branches/4.2.x/src/strstream.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/strstream.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/strstream.cpp (original)
+++ stdcxx/branches/4.2.x/src/strstream.cpp Wed Sep 10 12:28:36 2008
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2006 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -40,7 +40,7 @@
 
 #include <rw/_defs.h>
 
-#include <limits.h>
+#include <stddef.h>   // for size_t
 
 #include <ios>
 #include <strstream>
@@ -50,7 +50,7 @@
 
 
 /* virtual */
-strstreambuf::~strstreambuf ()
+strstreambuf::~strstreambuf () /* nothrow */
 {
     _RWSTD_ASSERT (_C_is_valid ());
 
@@ -91,7 +91,7 @@
 
 
 /* virtual */ strstreambuf::int_type
-strstreambuf::pbackfail (int_type c)
+strstreambuf::pbackfail (int_type c) /* nothrow */
 {
     _RWSTD_ASSERT (_C_is_valid ());
 
@@ -133,7 +133,7 @@
 
 
 /* virtual */ strstreambuf::int_type
-strstreambuf::underflow ()
+strstreambuf::underflow () /* nothrow */
 {
     _RWSTD_ASSERT (_C_is_valid ());
 
@@ -162,6 +162,7 @@
 
 /* virtual */ strstreambuf::pos_type
 strstreambuf::seekoff (off_type off, ios::seekdir way, ios::openmode which)
+    /* nothrow */
 {
     _RWSTD_ASSERT (_C_is_valid ());
 
@@ -229,7 +230,7 @@
 
 
 /* virtual */ strstreambuf::pos_type
-strstreambuf::seekpos (pos_type sp, ios::openmode which)
+strstreambuf::seekpos (pos_type sp, ios::openmode which) /* nothrow */
 {
     _RWSTD_ASSERT (_C_is_valid ());
 
@@ -344,9 +345,9 @@
          const void *gnext_v,
          streamsize  n,
          const void *pbeg_v,
-         void*     (*palloc)(_RWSTD_SIZE_T),
+         void*     (*palloc)(size_t),
          void      (*pdealloc)(void*),
-         int         state)
+         int         state) _THROWS (())
 {
     _C_alsize = alsize;
     _C_palloc = palloc;

Modified: stdcxx/branches/4.2.x/src/time_put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/time_put.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/time_put.cpp (original)
+++ stdcxx/branches/4.2.x/src/time_put.cpp Wed Sep 10 12:28:36 2008
@@ -133,13 +133,13 @@
     (_RW::__rw_classic_tab [(unsigned char)c] & _RW::__rw_digit)
 
 
-_RWSTD_SIZE_T
+size_t
 __rw_get_timepunct (const _RW::__rw_facet*, int,
-                    const void*[], const _RWSTD_SIZE_T []);
+                    const void*[], const size_t []);
 
 // also declared in _time_put.cc
 _RWSTD_EXPORT char*
-__rw_put_time (const __rw_facet*, char*, _RWSTD_SIZE_T,
+__rw_put_time (const __rw_facet*, char*, size_t,
                _STD::ios_base&, char, const tm*,
                char, char, int, int);
 
@@ -148,7 +148,7 @@
 
 // also declared in _time_put.cc
 _RWSTD_EXPORT wchar_t*
-__rw_put_time (const __rw_facet*, wchar_t*, _RWSTD_SIZE_T,
+__rw_put_time (const __rw_facet*, wchar_t*, size_t,
                _STD::ios_base&, wchar_t, const tm*,
                char, char, int, int);
 
@@ -164,7 +164,7 @@
 
 // compute the format string corresponding to the "%x" format specifier
 // in the current locale (set by setlocale (LC_ALL, ...))
-static _RWSTD_SIZE_T
+static size_t
 __rw_get_date_fmat (char *fmt)
 {
     tm t;
@@ -190,10 +190,10 @@
     char abmon [256];   // buffer for abbreviated month name
     char mon [256];     // buffer for full month name
 
-    _RWSTD_SIZE_T abday_len = 0;
-    _RWSTD_SIZE_T day_len;
-    _RWSTD_SIZE_T abmon_len;
-    _RWSTD_SIZE_T mon_len;
+    size_t abday_len = 0;
+    size_t day_len;
+    size_t abmon_len;
+    size_t mon_len;
 
     for (char *ptmp = tmp; *ptmp; ) {
 
@@ -215,7 +215,7 @@
                 *pfmt++ = *ptmp;
         }
 
-        const _RWSTD_SIZE_T len = ptmp - begin;
+        const size_t len = ptmp - begin;
 
         if (len > 1) {
 
@@ -231,7 +231,7 @@
             }
 
             char fmtchar = '\0';
-            _RWSTD_SIZE_T start = 0;
+            size_t start = 0;
 
             if (day_len <= len && !memcmp (day, begin, day_len)) {
                 fmtchar = 'A';
@@ -301,7 +301,7 @@
 
 // compute the format string corresponding to the "%X" format specifier
 // in the current locale (set by setlocale (LC_ALL, ...))
-static _RWSTD_SIZE_T
+static size_t
 __rw_get_time_fmat (char *fmt)
 {
     tm t;
@@ -319,7 +319,7 @@
 
     char pm [256];   // buffer for pm designator
 
-    _RWSTD_SIZE_T pm_len = 0;
+    size_t pm_len = 0;
 
     for (char *ptmp = tmp; *ptmp; ) {
 
@@ -340,7 +340,7 @@
                 *pfmt++ = *ptmp;
         }
 
-        const _RWSTD_SIZE_T len = ptmp - begin;
+        const size_t len = ptmp - begin;
 
         if (len > 1) {
             if (0 == pm_len) {
@@ -355,7 +355,7 @@
                 *pfmt++ = 'p';
 
                 // copy whatever follows the pm designator
-                for (_RWSTD_SIZE_T i = pm_len; i != len; ++i)
+                for (size_t i = pm_len; i != len; ++i)
                     *pfmt++ = begin [i];
             }
         }
@@ -411,7 +411,7 @@
 
 
 const void*
-__rw_get_timepunct (const __rw_facet *pfacet, int flags, _RWSTD_SIZE_T inx)
+__rw_get_timepunct (const __rw_facet *pfacet, int flags, size_t inx)
 {
     const int  member = flags & ~__rw_wide;
     const bool wide   = !!(flags & __rw_wide);
@@ -449,7 +449,7 @@
     // set all categories (need LC_TIME and LC_CTYPE) and lock
     const __rw_setlocale clocale (locname, _RWSTD_LC_ALL);
 
-    _RWSTD_SIZE_T bufsize = 2048;
+    size_t bufsize = 2048;
 
     const size_t newsize = bufsize + sizeof (__rw_time_t);
  
@@ -470,22 +470,22 @@
     // reserve offset 0 for the empty string (both narrow and wide)
     *_RWSTD_REINTERPRET_CAST (wchar_t*, pbuf) = L'\0';
 
-    _RWSTD_SIZE_T off = sizeof (wchar_t);
+    size_t off = sizeof (wchar_t);
 
 #else   // if defined (_RWSTD_NO_WCHAR_T)
 
     // reserve offset 0 for the empty string
     *pbuf = '\0';
 
-    _RWSTD_SIZE_T off = sizeof (char);
+    size_t off = sizeof (char);
 
 #endif   // _RWSTD_NO_WCHAR_T
 
 #ifndef _RWSTD_NO_NL_LANGINFO
 
     static const struct {
-        int           nl_item;    // argument to nl_langinfo()
-        _RWSTD_SIZE_T moff [2];   // member offset
+        int    nl_item;    // argument to nl_langinfo()
+        size_t moff [2];   // member offset
     } nl_items [] = {
 
 
@@ -588,7 +588,7 @@
 
     const bool c_locale = 'C' == locname [0] && '\0' == locname [1];
 
-    for (_RWSTD_SIZE_T i = 0; i != sizeof nl_items / sizeof *nl_items; ++i) {
+    for (size_t i = 0; i != sizeof nl_items / sizeof *nl_items; ++i) {
 
         if (D_T_FMT == nl_items [i].nl_item && i)
             continue;
@@ -599,11 +599,11 @@
 
         _RWSTD_ASSERT (0 != str);
 
-        _RWSTD_SIZE_T size = 1 + strlen (str);
+        size_t size = 1 + strlen (str);
 
         // estimate the size required to accommodate both
         // the narrow and the wide char representations
-        const _RWSTD_SIZE_T estsize = size * (1 + sizeof (wchar_t));
+        const size_t estsize = size * (1 + sizeof (wchar_t));
 
         if (off + estsize >= bufsize) {
             // reallocate
@@ -632,7 +632,7 @@
 #ifndef _RWSTD_NO_WCHAR_T
 
         // make sure wide string is properly aligned
-        const _RWSTD_SIZE_T align = off % sizeof (wchar_t);
+        const size_t align = off % sizeof (wchar_t);
         if (align)
             off += sizeof (wchar_t) - align;
 
@@ -665,14 +665,14 @@
 
     memset (&t, 0, sizeof t);
 
-    _RWSTD_SIZE_T len;
+    size_t len;
 
 
 #if 0   // FIXME: implement same way as above
 
     static const struct {
         int tm::      *pmem;
-        _RWSTD_SIZE_T  moff;
+        size_t         moff;
         const char     fmt [3];
         int            begin;
         int            end;
@@ -685,7 +685,7 @@
         { &tm::tm_hour, "%p", 1, 13, 12 }
     };
 
-    for (_RWSTD_SIZE_T i = 0; i != sizeof fmats / sizef *fmats; ++i) {
+    for (size_t i = 0; i != sizeof fmats / sizef *fmats; ++i) {
 
         for (int j = fmats [i].begin; j != fmats [i].end; j != fmats [i].step) {
 
@@ -717,7 +717,7 @@
 #  ifndef _RWSTD_NO_WCHAR_T
 
         // make sure wide strings are properly aligned
-        const _RWSTD_SIZE_T align = off % sizeof (wchar_t);
+        const size_t align = off % sizeof (wchar_t);
         if (align)
             off += sizeof (wchar_t) - align;
 
@@ -743,7 +743,7 @@
             _RWSTD_STATIC_CAST (const char*, pun->abday (t.tm_wday, 0));
 
         wchar_t *pwbuf = _RWSTD_REINTERPRET_CAST (wchar_t*, pbuf + off);
-        _RWSTD_SIZE_T size =
+        size_t size =
             mbstowcs (pwbuf, str, (bufsize - off) / sizeof (*pwbuf));
 
         if (_RWSTD_SIZE_MAX == size) {
@@ -797,7 +797,7 @@
 #  ifndef _RWSTD_NO_WCHAR_T
 
         // make sure wide strings are properly aligned
-        const _RWSTD_SIZE_T align = off % sizeof (wchar_t);
+        const size_t align = off % sizeof (wchar_t);
         if (align)
             off += sizeof (wchar_t) - align;
 
@@ -822,7 +822,7 @@
         const char *str =
             _RWSTD_STATIC_CAST (const char*, pun->abmon (t.tm_mon, 0));
         wchar_t *pwbuf = _RWSTD_REINTERPRET_CAST (wchar_t*, pbuf + off);
-        _RWSTD_SIZE_T size =
+        size_t size =
             mbstowcs (pwbuf, str, (bufsize - off) / sizeof (*pwbuf));
 
         if (_RWSTD_SIZE_MAX == size) {
@@ -911,13 +911,13 @@
 
 #  ifndef _RWSTD_NO_WCHAR_T
 
-    const _RWSTD_SIZE_T align = off % sizeof (wchar_t);
+    const size_t align = off % sizeof (wchar_t);
     if (align)
         off += sizeof (wchar_t) - align;
 
-    const char    *str;
-    wchar_t       *pwbuf;
-    _RWSTD_SIZE_T  size;
+    const char *str;
+    wchar_t    *pwbuf;
+    size_t      size;
 
 #    ifndef _RWSTD_NO_WCSFTIME
 
@@ -1058,15 +1058,15 @@
 }
 
 
-_RWSTD_SIZE_T
+size_t
 __rw_get_timepunct (const __rw_facet *pfacet, int flags,
-                    const void *names[], _RWSTD_SIZE_T sizes[])
+                    const void *names[], size_t sizes[])
 {
     const bool wide = !!(flags & __rw_wide);
 
     const int member = flags & ~__rw_wide;
 
-    _RWSTD_SIZE_T count = 0;
+    size_t count = 0;
 
     int flags_2 = 0;
 
@@ -1102,7 +1102,7 @@
             _RWSTD_STATIC_CAST (const __rw_time_t*,
                                 __rw_get_timepunct (pfacet, 0, 0));
 
-        count = (_RWSTD_SIZE_T)ptime->era_count ();
+        count = size_t (ptime->era_count ());
         break;
     }
 
@@ -1124,7 +1124,7 @@
             _RWSTD_STATIC_CAST (const __rw_time_t*,
                                 __rw_get_timepunct (pfacet, 0, 0));
 
-        count = (_RWSTD_SIZE_T)ptime->alt_digits_count ();
+        count = size_t (ptime->alt_digits_count ());
         break;
     }
 
@@ -1144,7 +1144,7 @@
     if (wide)
         flags |= __rw_wide;
 
-    for (_RWSTD_SIZE_T i = 0; i != count; ++i) {
+    for (size_t i = 0; i != count; ++i) {
         names [i] = __rw_get_timepunct (pfacet, flags, i);
 
 #ifndef _RWSTD_NO_WCHAR_T
@@ -1163,7 +1163,7 @@
         if (wide)
             flags_2 |= __rw_wide;
 
-        for (_RWSTD_SIZE_T j = count; j != 2 * count; ++j) {
+        for (size_t j = count; j != 2 * count; ++j) {
             names [j] = __rw_get_timepunct (pfacet, flags_2, j - count);
 
 #ifndef _RWSTD_NO_WCHAR_T
@@ -1184,10 +1184,10 @@
 }
 
 
-_RWSTD_EXPORT _RWSTD_SIZE_T
+_RWSTD_EXPORT size_t
 __rw_get_timepunct (const __rw_facet *pfacet,
                     int data [4], tm *tmb, int **pmem,
-                    const void *names[], _RWSTD_SIZE_T sizes[])
+                    const void *names[], size_t sizes[])
 {
     enum _Fmt {   // for convenience
         _AmPm        = __rw_ampm,
@@ -1224,7 +1224,7 @@
     const void** pv =
         _RWSTD_REINTERPRET_CAST (const void**, names);
 
-    _RWSTD_SIZE_T cnt = 0;
+    size_t cnt = 0;
 
     int flags = 0;
 
@@ -1489,7 +1489,7 @@
 
 
 static char*
-__rw_fmt_time (const __rw_facet *pfacet, char *buf, _RWSTD_SIZE_T bufsize,
+__rw_fmt_time (const __rw_facet *pfacet, char *buf, size_t bufsize,
                _STD::ios_base &flags, char fill, const tm *tmb,
                const char *pat)
 {
@@ -1627,7 +1627,7 @@
 #ifndef _RWSTD_NO_WCHAR_T
 
 static wchar_t*
-__rw_fmt_time (const __rw_facet *pfacet, wchar_t *wbuf, _RWSTD_SIZE_T bufsize,
+__rw_fmt_time (const __rw_facet *pfacet, wchar_t *wbuf, size_t bufsize,
                _STD::ios_base &flags, wchar_t fill, const tm *tmb,
                const wchar_t *wpat)
 {
@@ -1827,9 +1827,9 @@
     const int year = 1900 + tmb->tm_year;
 
     // get the number of eras in this locale
-    const _RWSTD_SIZE_T neras = (_RWSTD_SIZE_T)ptime->era_count ();
+    const size_t neras = size_t (ptime->era_count ());
 
-    for (_RWSTD_SIZE_T i = 0; i != neras; ++i) {
+    for (size_t i = 0; i != neras; ++i) {
         const __rw_time_t::era_t* const pera = ptime->era (i);
 
         _RWSTD_ASSERT (0 != pera);
@@ -2662,13 +2662,13 @@
 
 
 _RWSTD_EXPORT char*
-__rw_put_time (const __rw_facet *facet, char *buf, _RWSTD_SIZE_T bufsize,
+__rw_put_time (const __rw_facet *facet, char *buf, size_t bufsize,
                _STD::ios_base &flags, char fill, const tm *tmb,
                char fmt, char mod, int width, int prec)
 {
     _RWSTD_ASSERT (0 != facet);
 
-    _RWSTD_SIZE_T res = 0;   // size of formatted output, -1 on error
+    size_t res = 0;   // size of formatted output, -1 on error
 
     // compute the values and get the format
     __rw_time_put_data tpd;
@@ -2713,9 +2713,9 @@
 
         const char* const fmtstr = 'z' == fmt ? "%+*.*d" : "%*.*d";
 
-        res = (_RWSTD_SIZE_T)sprintf (buf, fmtstr,
-                                      width < 0 ? tpd.width : width,
-                                      prec < 0 ? tpd.prec : prec, tpd.val);
+        res = size_t (sprintf (buf, fmtstr,
+                               width < 0 ? tpd.width : width,
+                               prec < 0 ? tpd.prec : prec, tpd.val));
     }
     else {
         if (!tmb && tpd.fmt) {
@@ -2764,13 +2764,13 @@
 #ifndef _RWSTD_NO_WCHAR_T
 
 _RWSTD_EXPORT wchar_t*
-__rw_put_time (const __rw_facet *facet, wchar_t *wbuf, _RWSTD_SIZE_T bufsize,
+__rw_put_time (const __rw_facet *facet, wchar_t *wbuf, size_t bufsize,
                _STD::ios_base &flags, wchar_t fill, const tm *tmb,
                char fmt, char mod, int width, int prec)
 {
     _RWSTD_ASSERT (0 != facet);
 
-    _RWSTD_SIZE_T res = 0;   // size of formatted output, -1 on error
+    size_t res = 0;   // size of formatted output, -1 on error
 
     __rw_time_put_data tpd;
 
@@ -2787,8 +2787,8 @@
 
         if (tpd.altval >= 0 && tpd.altval < int (n)) {
 
-            const _RWSTD_SIZE_T altval =
-                _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, tpd.altval);
+            const size_t altval =
+                _RWSTD_STATIC_CAST (size_t, tpd.altval);
 
             // format using alternative numeric symbols
             const wchar_t* digit =
@@ -2830,9 +2830,9 @@
 
         char buf [64];
 
-        res = (_RWSTD_SIZE_T)::sprintf (buf, fmtstr,
-                                        width < 0 ? tpd.width : width,
-                                        prec < 0 ? tpd.prec : prec, tpd.val);
+        res = size_t (sprintf (buf, fmtstr,
+                               width < 0 ? tpd.width : width,
+                               prec < 0 ? tpd.prec : prec, tpd.val));
 
         _RWSTD_ASSERT (res < sizeof buf);
 
@@ -2905,7 +2905,7 @@
 
             if (res <= sizeof buf) {
                 // widen narrow (not multibyte) result into wide buffer
-                for (_RWSTD_SIZE_T i = 0; i != res; ++i)
+                for (size_t i = 0; i != res; ++i)
                     wbuf [i] = _RWSTD_STATIC_CAST (unsigned char, buf [i]);
             }
 

Modified: stdcxx/branches/4.2.x/src/tmpbuf.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/tmpbuf.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/tmpbuf.cpp (original)
+++ stdcxx/branches/4.2.x/src/tmpbuf.cpp Wed Sep 10 12:28:36 2008
@@ -31,6 +31,9 @@
 #include "podarray.h"        // for __rw_aligned_buffer
 #include <rw/_allocator.h>   // for __rw_allocate(), ...
 #include <rw/_mutex.h>       // for _RWSTD_THREAD_XXX()
+
+#include <stddef.h>          // for size_t
+
 #include <rw/_defs.h>
 
 
@@ -53,17 +56,17 @@
 
 
 // used by std::get_temporary_buffer<>()
-_RWSTD_EXPORT _RWSTD_SIZE_T
-__rw_tmpbuf (void **pptr, _RWSTD_PTRDIFF_T nelems, _RWSTD_SIZE_T size)
+_RWSTD_EXPORT size_t
+__rw_tmpbuf (void **pptr, _RWSTD_PTRDIFF_T nelems, size_t size)
 {
     _RWSTD_ASSERT (0 != pptr);
     _RWSTD_ASSERT (0 != size);
 
     // detect overflow and fail
-    _RWSTD_SIZE_T nbytes = nelems * size;
+    size_t nbytes = nelems * size;
 
     if (   nelems < 0
-        || nbytes / size != _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, nelems)
+        || nbytes / size != _RWSTD_STATIC_CAST (size_t, nelems)
         || nelems && nbytes / nelems != size) {
         *pptr = 0;
         return 0;

Modified: stdcxx/branches/4.2.x/src/valarray.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/valarray.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/valarray.cpp (original)
+++ stdcxx/branches/4.2.x/src/valarray.cpp Wed Sep 10 12:28:36 2008
@@ -22,14 +22,14 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2006 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
 #define _RWSTD_LIB_SRC
 
 #include <valarray>
-#include <string.h>   // for memset()
+#include <string.h>   // for memset(), size_t
 
 #include <rw/_defs.h>
 
@@ -37,9 +37,9 @@
 _RWSTD_NAMESPACE (std) { 
 
 
-_RWSTD_SIZE_T gslice::next_ind ()
+size_t gslice::next_ind ()
 {
-    _RWSTD_SIZE_T __n = _C_length.size ();
+    size_t __n = _C_length.size ();
 
     for (/**/; __n; --__n)
     {
@@ -69,8 +69,8 @@
     else
         __n = _C_r_length.size ();
 
-    _RWSTD_SIZE_T __inx = _C_start;
-    for (_RWSTD_SIZE_T __i = 0; __i != __n; ++__i)
+    size_t __inx = _C_start;
+    for (size_t __i = 0; __i != __n; ++__i)
         __inx += _C_r_length [__i] * _C_stride [__i];
 
     return __inx;

Modified: stdcxx/branches/4.2.x/src/wctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/wctype.cpp?rev=693942&r1=693941&r2=693942&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/wctype.cpp (original)
+++ stdcxx/branches/4.2.x/src/wctype.cpp Wed Sep 10 12:28:36 2008
@@ -86,15 +86,15 @@
         for (; beg != end; ++beg) {
 
             // using binary search look up the character and its mask
-            _RWSTD_SIZE_T low  = 0;
-            _RWSTD_SIZE_T high = (_RWSTD_SIZE_T)impl->wmask_s;
+            size_t low  = 0;
+            size_t high = size_t (impl->wmask_s);
 
             if (vec)
                 *vec = MaskT ();
 
             while (low <= high) {
 
-                const _RWSTD_SIZE_T cur = (low + high) / 2;
+                const size_t cur = (low + high) / 2;
                 const __rw_mask_elm next_elm = impl->wmask_tab (cur);
 
                 if (next_elm.ch == *beg) {
@@ -138,7 +138,7 @@
 
         // does the value of *beg fit into the range of an unsigned char?
         const bool fits_char =
-            _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, *beg) <= _RWSTD_UCHAR_MAX;
+            _RWSTD_STATIC_CAST (size_t, *beg) <= _RWSTD_UCHAR_MAX;
 
         // `fits_char' is not used if all wide character
         // classification functions use below are present
@@ -251,9 +251,9 @@
 {
     if (use_libstd && impl != 0) {
 
-        _RWSTD_SIZE_T low  = 0;
-        _RWSTD_SIZE_T high = (_RWSTD_SIZE_T)impl->wtoupper_s();
-        _RWSTD_SIZE_T cur;
+        size_t low  = 0;
+        size_t high = size_t (impl->wtoupper_s ());
+        size_t cur;
 
         __rw_upper_elm next_elm;
 
@@ -284,7 +284,7 @@
 
 #else   // if defined (_RWSTD_NO_TOWUPPER)
 
-        if (_RWSTD_STATIC_CAST (_RWSTD_SIZE_T, c) <= _RWSTD_UCHAR_MAX) {
+        if (_RWSTD_STATIC_CAST (size_t, c) <= _RWSTD_UCHAR_MAX) {
 
             const __rw_setlocale clocale (locname, LC_CTYPE);
 
@@ -306,9 +306,9 @@
 {
     if (use_libstd && impl != 0) {
 
-        _RWSTD_SIZE_T low  = 0;
-        _RWSTD_SIZE_T high = (_RWSTD_SIZE_T)impl->wtolower_s ();
-        _RWSTD_SIZE_T cur;
+        size_t low  = 0;
+        size_t high = size_t (impl->wtolower_s ());
+        size_t cur;
 
         __rw_lower_elm next_elm;
 
@@ -339,7 +339,7 @@
 
 #else   // if defined (_RWSTD_NO_TOWLOWER)
 
-        if (_RWSTD_STATIC_CAST (_RWSTD_SIZE_T, c) <= _RWSTD_UCHAR_MAX) {
+        if (_RWSTD_STATIC_CAST (size_t, c) <= _RWSTD_UCHAR_MAX) {
 
             const __rw_setlocale clocale (locname, LC_CTYPE);
 
@@ -421,7 +421,7 @@
 _RW::__rw_facet_id ctype<wchar_t>::id;
 
 
-ctype<wchar_t>::ctype (_RWSTD_SIZE_T ref) _THROWS (())
+ctype<wchar_t>::ctype (size_t ref) _THROWS (())
     : _RW::__rw_facet (ref)
 {
 #ifndef _RWSTD_NO_EQUAL_CTYPE_MASK
@@ -459,7 +459,7 @@
 bool ctype<wchar_t>::
 do_is (mask m, char_type c) const
 {
-    return    _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, c) <= _C_tab_size
+    return    _RWSTD_STATIC_CAST (size_t, c) <= _C_tab_size
            && (_C_mask_tab [_UChar (c)] & m);
 }
 
@@ -471,7 +471,7 @@
     _RWSTD_ASSERT (lo <= hi);
 
     for ( ; lo != hi; ++lo, ++mvec) {
-        *mvec = _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, *lo) < _C_tab_size ?
+        *mvec = _RWSTD_STATIC_CAST (size_t, *lo) < _C_tab_size ?
             _C_mask_tab [_UChar (*lo)] : mask (0);
     }
 
@@ -509,7 +509,7 @@
 ctype<wchar_t>::
 do_toupper (char_type c) const
 {
-    return _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, c) < _C_tab_size ?
+    return _RWSTD_STATIC_CAST (size_t, c) < _C_tab_size ?
         _C_upper_tab [_UChar (c)] : c;
 }
 
@@ -518,7 +518,7 @@
 ctype<wchar_t>::
 do_tolower (char_type c) const
 {
-    return _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, c) < _C_tab_size ?
+    return _RWSTD_STATIC_CAST (size_t, c) < _C_tab_size ?
         _C_lower_tab [_UChar (c)] : c;
 }
 
@@ -530,7 +530,7 @@
     _RWSTD_ASSERT (lo <= hi);
 
     for ( ; lo < hi; ++lo)
-        *lo = _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, *lo) < _C_tab_size ?
+        *lo = _RWSTD_STATIC_CAST (size_t, *lo) < _C_tab_size ?
             _C_upper_tab [_UChar (*lo)] : 0;
 
     return lo;
@@ -544,7 +544,7 @@
     _RWSTD_ASSERT (lo <= hi);
 
     for ( ; lo < hi; ++lo)
-        *lo = _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, *lo) < _C_tab_size ?
+        *lo = _RWSTD_STATIC_CAST (size_t, *lo) < _C_tab_size ?
             _C_lower_tab [_UChar (*lo)] : 0;
 
     return lo;
@@ -558,7 +558,7 @@
     _RWSTD_ASSERT (lo <= hi);
 
     for ( ; lo != hi; ++lo) {
-        if (   _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, *lo) <= _C_tab_size
+        if (   _RWSTD_STATIC_CAST (size_t, *lo) <= _C_tab_size
             && (_C_mask_tab [_UChar (*lo)] & m))
             break;
     }
@@ -573,7 +573,7 @@
 {
     _RWSTD_ASSERT (lo <= hi);
     for ( ; lo != hi; ++lo) {
-        if (   _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, *lo) >= _C_tab_size
+        if (   _RWSTD_STATIC_CAST (size_t, *lo) >= _C_tab_size
             || !(_C_mask_tab [_UChar (*lo)] & m))
             break;
     }
@@ -586,7 +586,7 @@
 ctype<wchar_t>::
 do_narrow (char_type c, char dfault) const
 {
-    return _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, c) <= _RWSTD_SCHAR_MAX ?
+    return _RWSTD_STATIC_CAST (size_t, c) <= _RWSTD_SCHAR_MAX ?
         _RWSTD_STATIC_CAST (char, c) : dfault;
 }
 
@@ -605,7 +605,7 @@
 
 
 ctype_byname<wchar_t>::
-ctype_byname (const char *name, _RWSTD_SIZE_T refs)
+ctype_byname (const char *name, size_t refs)
     : ctype<wchar_t> (refs), _C_cvtimpl (0), _C_cvtsize (0)
 {
     this->_C_set_name (name, _C_namebuf, sizeof _C_namebuf);
@@ -637,12 +637,12 @@
 
         // casts prevent bogus gcc 2.95.2 warning:
         //     size in array new must have integral type
-        _C_mask_tab = new mask [(_RWSTD_SIZE_T)_C_tab_size];
+        _C_mask_tab = new mask [size_t (_C_tab_size)];
 
         _TRY {
             // avoid doing one extra allocation by allocating
             // both the upper and lower tables in the same space
-            _C_upper_tab = new _UChar [(_RWSTD_SIZE_T)_C_tab_size * 2];
+            _C_upper_tab = new _UChar [size_t (_C_tab_size) * 2];
             _C_lower_tab = _C_upper_tab + _C_tab_size;
         }
         _CATCH (...) {
@@ -726,25 +726,23 @@
 
             _RWSTD_CONST_CAST (mask*, _C_mask_tab) [i]  = mask (m);
 
-            typedef _RWSTD_SIZE_T SizeT;
-
 #ifndef _RWSTD_NO_TOWUPPER
-            const SizeT upr = SizeT ((::towupper)(i));
+            const size_t upr = size_t ((::towupper)(i));
 #else   // if defined (_RWSTD_NO_TOWUPPER)
-            const SizeT upr = SizeT ((::toupper)(i));
+            const size_t upr = size_t ((::toupper)(i));
 #endif   // _RWSTD_NO_TOWUPPER
 
 #ifndef _RWSTD_NO_TOWLOWER
-            const SizeT lwr = SizeT ((::towlower)(i));
+            const size_t lwr = size_t ((::towlower)(i));
 #else   // if defined (_RWSTD_NO_TOWLOWER)
-            const SizeT lwr = SizeT ((::tolower)(i));
+            const size_t lwr = size_t ((::tolower)(i));
 #endif   // _RWSTD_NO_TOWLOWER
 
             // optimize (and avoid warnings) when wint_t is unsigned
-            _C_upper_tab [i] = upr <= SizeT (_RWSTD_UCHAR_MAX) ?
+            _C_upper_tab [i] = upr <= size_t (_RWSTD_UCHAR_MAX) ?
                 _UChar (upr) : _UChar (0);
 
-            _C_lower_tab [i] = lwr <= SizeT (_RWSTD_UCHAR_MAX) ?
+            _C_lower_tab [i] = lwr <= size_t (_RWSTD_UCHAR_MAX) ?
                 _UChar (lwr) : _UChar (0);
         }
     }
@@ -968,7 +966,7 @@
 
         char  tmp [_UTF8_MB_CUR_MAX + 1];
         char* ptmp = tmp;
-        _RWSTD_SIZE_T utf8_sz = _RW::__rw_itoutf8 (c, tmp);
+        size_t utf8_sz = _RW::__rw_itoutf8 (c, tmp);
 
 #if _RWSTD_WCHAR_MIN < 0
         // compute the invalid bit mask (the MSB set)
@@ -979,7 +977,7 @@
 
         typedef unsigned char UChar;
         
-        _RWSTD_SIZE_T i = 0;
+        size_t i = 0;
         wc = ptbl [UChar (*ptmp)];
         while (wc & imask) {
             // check validity of the value
@@ -1002,7 +1000,7 @@
         // to have length of one
         const char* impl_raw = 
             _RWSTD_REINTERPRET_CAST(const char*, cvt);
-        _RWSTD_SIZE_T offset = wc + sizeof (_RW::__rw_codecvt_t);
+        size_t offset = wc + sizeof (_RW::__rw_codecvt_t);
 
         if (impl_raw [offset + 1])
             return dfault;



Mime
View raw message