stlport/STLport-4.5-0119.patch

   1 --- misc/STLport-4.5-0119/src/vc7.mak   Sun Jul 29 22:02:16 2001
   2 +++ misc/build/STLport-4.5-0119/src/vc7.mak     Mon Jun  2 10:32:02 2008
   3 @@ -1,5 +1,5 @@
   4  #
   5 -# STLport makefile for VC++ 7 (.NET)
   6 +# STLport makefile for VC++ 7/8/9 (.NET)
   7  #
   8
   9  CXX=cl.exe
  10 @@ -6,15 +6,16 @@
  11  CC=cl.exe
  12  RC=rc
  13
  14 -LIB_BASENAME=stlport_vc7
  15 +LIB_BASENAME=stlport_vc71
  16 +
  17  COMP=VC7
  18
  19  # EXTRA_COMMON_FLAGS=/D "_MBCS"
  20 -EXTRA_COMMON_FLAGS=/FI "vc_warning_disable.h" /D "_MBCS"
  21 +EXTRA_COMMON_FLAGS=/TP /FI "vc_warning_disable.h" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
  22  EXTRA_DEBUG_FLAGS=
  23  EXTRA_NDEBUG_FLAGS=
  24
  25 -all: platform all_static all_dynamic
  26 +all: platform all_static all_dynamic
  27
  28  !INCLUDE vc_common.mak
  29
  30 --- misc/STLport-4.5-0119/src/vc_common.mak     Wed Apr 10 05:55:31 2002
  31 +++ misc/build/STLport-4.5-0119/src/vc_common.mak       Mon Jun  2 10:32:02 2008
  32 @@ -27,7 +27,7 @@
  33  DYNEXT=dll
  34  STEXT=lib
  35
  36 -PATH_SEP=\\
  37 +PATH_SEP=\
  38
  39  MKDIR=-mkdir
  40  LINK_OUT=/out:
  41 @@ -51,7 +51,7 @@
  42  #
  43
  44  # FLAGS_COMMON =/nologo /c /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
  45 -FLAGS_COMMON =/nologo /c /Zi /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
  46 +FLAGS_COMMON =/nologo /c /Zi /W3 /GR $(EXFLAGS) /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
  47  FLAGS_COMMON_static = $(FLAGS_COMMON) /FD  /D "_STLP_NO_FORCE_INSTANTIATE"
  48  FLAGS_COMMON_dynamic = $(FLAGS_COMMON)
  49
  50 --- misc/STLport-4.5-0119/stlport/config/_epilog.h      Thu Sep  6 00:11:36 2001
  51 +++ misc/build/STLport-4.5-0119/stlport/config/_epilog.h        Mon Jun  2 10:32:02 2008
  52 @@ -4,6 +4,7 @@
  53  #  pragma option pop
  54  #  pragma option -w-8062
  55  # else
  56 +#  pragma pack(push,8)
  57  #  if !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200))
  58  #   pragma warning (pop)
  59  #  endif
  60 --- misc/STLport-4.5-0119/stlport/config/_prolog.h      Sun Oct 28 21:26:44 2001
  61 +++ misc/build/STLport-4.5-0119/stlport/config/_prolog.h        Mon Jun  2 10:32:02 2008
  62 @@ -7,10 +7,17 @@
  63  #  endif
  64  # else
  65  # if !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200))
  66 -#  pragma warning(push)
  67 +   // Disable "warning C4702: unreachable code" and "warning C4710: function not
  68 +   // inlined" globally, as they are only issued at the end of the compilation
  69 +   // unit.  Then locally disable as many warnings as possible, plus "warning
  70 +   // C4555: expression has no effect; expected expression with side-effect":
  71 +#  pragma warning(disable:4702 4710)
  72 +#  pragma warning(push,1)
  73 +#  pragma warning(disable:4555)
  74  # endif
  75  # pragma pack(push,8)
  76  # include <config/_msvc_warnings_off.h>
  77 +# pragma pack(pop)
  78  # endif
  79
  80
  81 --- misc/STLport-4.5-0119/stlport/config/stl_msvc.h     Sat Dec 28 07:12:58 2002
  82 +++ misc/build/STLport-4.5-0119/stlport/config/stl_msvc.h       Mon Jun  2 10:34:54 2008
  83 @@ -66,10 +66,15 @@
  84  #   define _STLP_DEFAULTCHAR __stl_char
  85  #  endif /* (_STLP_MSVC < 1100 ) */
  86
  87 -#  define _STLP_NO_TYPENAME_ON_RETURN_TYPE 1
  88 +# if (_STLP_MSVC <= 1300)
  89 +#  define _STLP_NO_TYPENAME_ON_RETURN_TYPE 1
  90 +# endif
  91 +# if (_STLP_MSVC > 1300)
  92 +#    define _STLP_NO_METHOD_SPECIALIZATION 1
  93 +# endif
  94  //  using ::func_name results in ambiguity
  95
  96 -# if (_STLP_MSVC <= 1300)
  97 +# if (_STLP_MSVC <= 1310)
  98
  99  // boris : not defining this macro for SP5 causes other problems
 100  // #  if !defined (_MSC_FULL_VER) || (_MSC_FULL_VER < 12008804 )
 101 @@ -94,7 +99,7 @@
 102  # endif /* _STLP_MSVC */
 103
 104
 105 -# if (_MSC_VER <= 1300)
 106 +# if (_MSC_VER <= 1500)
 107
 108  #  define _STLP_VENDOR_GLOBAL_CSTD
 109  // They included the necessary coding,
 110 @@ -129,7 +134,7 @@
 111  # if defined (_STLP_MSVC) && ( _STLP_MSVC < 1200 ) /* VC++ 6.0 */
 112  // #  define _STLP_NO_MEMBER_TEMPLATES 1
 113  // #  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
 114 -#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
 115 +#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
 116  #  define _STLP_THROW_RETURN_BUG 1
 117  # endif
 118
 119 @@ -178,8 +183,8 @@
 120  # ifdef __ICL
 121  #  define _STLP_LIB_BASENAME "stlport_icl"
 122  # else
 123 -# if (_MSC_VER >= 1300)
 124 -#   define _STLP_LIB_BASENAME "stlport_vc7"
 125 +# if (_MSC_VER > 1300)
 126 +#   define _STLP_LIB_BASENAME "stlport_vc71"
 127  # elif (_MSC_VER >= 1200)
 128  //#   ifdef _UNICODE
 129  //#    define _STLP_LIB_BASENAME "stlport_vc6_unicode"
 130 --- misc/STLport-4.5-0119/stlport/cstdio        Sun Dec  2 23:17:40 2001
 131 +++ misc/build/STLport-4.5-0119/stlport/cstdio  Mon Jun  2 10:32:02 2008
 132 @@ -42,7 +42,7 @@
 133  #  define stderr       (&_STLP_VENDOR_CSTD::__files[2])
 134  # endif
 135
 136 -#  if defined (_STLP_MSVC) || defined (__ICL)
 137 +#  if defined (_STLP_MSVC) && (_MSC_VER <= 1310) || defined (__ICL)
 138  inline
 139  int vsnprintf(char *s1, size_t n, const char *s2, va_list v)
 140  {
 141 @@ -110,7 +110,7 @@
 142  using _STLP_VENDOR_CSTD::vfprintf;
 143  using _STLP_VENDOR_CSTD::vprintf;
 144  using _STLP_VENDOR_CSTD::vsprintf;
 145 -#   if (defined (__MWERKS__) || defined (_STLP_MSVC) || defined (__ICL) || \
 146 +#   if (defined (__MWERKS__) || (defined (_STLP_MSVC) && (_MSC_VER <= 1310)) || defined (__ICL) || \
 147  ( defined (__BORLANDC__) && __BORLANDC__ > 0x530))
 148  using _STLP_VENDOR_CSTD::vsnprintf;
 149  #   endif
 150 --- misc/STLport-4.5-0119/stlport/list  Wed Apr 10 05:55:34 2002
 151 +++ misc/build/STLport-4.5-0119/stlport/list    Mon Jun  2 10:32:02 2008
 152 @@ -37,7 +37,14 @@
 153
 154  #ifndef _STLP_INTERNAL_LIST_H
 155  # include <stl/_list.h>
 156 +#if ( _MSC_VER > 1200 )
 157 +_STLP_BEGIN_NAMESPACE
 158 +# if defined (_STLP_USE_TEMPLATE_EXPORT)
 159 +_STLP_EXPORT_TEMPLATE_CLASS allocator<void*>;
 160 +# endif
 161 +_STLP_END_NAMESPACE
 162  #endif
 163 +#endif
 164
 165  #if defined (_STLP_WHOLE_VENDOR_STD)
 166  # include _STLP_NATIVE_HEADER(list)
 167 --- misc/STLport-4.5-0119/stlport/stl/_cmath.h  Mon Oct 28 17:18:49 2002
 168 +++ misc/build/STLport-4.5-0119/stlport/stl/_cmath.h    Mon Jun  2 10:32:02 2008
 169 @@ -50,7 +50,7 @@
 170    static inline _Tp _do_tan(const _Tp& __x)     { return _STLP_VENDOR_CSTD::tan(__x); }
 171    static inline _Tp _do_tanh(const _Tp& __x)    { return _STLP_VENDOR_CSTD::tanh(__x); }
 172    static inline _Tp _do_exp(const _Tp& __x)     { return _STLP_VENDOR_CSTD::exp(__x); }
 173 -  static inline _Tp _do_hypot(const _Tp& __x, const _Tp& __y)   { return _STLP_VENDOR_CSTD::hypot(__x, __y); }
 174 +  static inline _Tp _do_hypot(const _Tp& __x, const _Tp& __y)   { return hypot(__x, __y); }
 175  };
 176
 177  #  define _STLP_DO_ABS(_Tp)   _STL_math_proxy<_Tp>::_do_abs
 178 --- misc/STLport-4.5-0119/stlport/stl/_deque.c  Thu Sep 12 22:46:59 2002
 179 +++ misc/build/STLport-4.5-0119/stlport/stl/_deque.c    Mon Jun  2 10:32:02 2008
 180 @@ -26,6 +26,10 @@
 181  #ifndef _STLP_DEQUE_C
 182  # define _STLP_DEQUE_C
 183
 184 +#if defined(_MSC_VER) && (_MSC_VER > 1310)
 185 +#pragma warning(disable:4701)
 186 +#endif
 187 +
 188  # ifndef _STLP_INTERNAL_DEQUE_H
 189  #  include <stl/_deque.h>
 190  # endif
 191 --- misc/STLport-4.5-0119/stlport/stl/_hashtable.h      Thu Sep 12 22:46:59 2002
 192 +++ misc/build/STLport-4.5-0119/stlport/stl/_hashtable.h        Mon Jun  2 10:32:02 2008
 193 @@ -9,13 +9,13 @@
 194   * Copyright (c) 1997
 195   * Moscow Center for SPARC Technology
 196   *
 197 - * Copyright (c) 1999
 198 + * Copyright (c) 1999
 199   * Boris Fomitchev
 200   *
 201   * This material is provided "as is", with absolutely no warranty expressed
 202   * or implied. Any use is at your own risk.
 203   *
 204 - * Permission to use or copy this software for any purpose is hereby granted
 205 + * Permission to use or copy this software for any purpose is hereby granted
 206   * without fee, provided the above notices are retained on all copies.
 207   * Permission to modify the code and to distribute modified code is granted,
 208   * provided the above notices are retained, and a notice that the code was
 209 @@ -66,7 +66,7 @@
 210    _Self* _M_next;
 211    _Val _M_val;
 212    __TRIVIAL_STUFF(_Hashtable_node)
 213 -};
 214 +};
 215
 216  // some compilers require the names of template parameters to be the same
 217  template <class _Val, class _Key, class _HF,
 218 @@ -84,7 +84,7 @@
 219    _Node* _M_cur;
 220    _Hashtable* _M_ht;
 221
 222 -  _Hashtable_iterator(_Node* __n, _Hashtable* __tab)
 223 +  _Hashtable_iterator(_Node* __n, _Hashtable* __tab)
 224      : _M_cur(__n), _M_ht(__tab) {}
 225    _Hashtable_iterator() {}
 226
 227 @@ -96,7 +96,7 @@
 228            class _ExK, class _EqK, class _All>
 229  struct _Ht_iterator : public _Hashtable_iterator< _Val, _Key,_HF, _ExK,_EqK,_All>
 230  {
 231 -
 232 +
 233    typedef _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All> _Base;
 234
 235    //  typedef _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All> iterator;
 236 @@ -116,11 +116,11 @@
 237    _Ht_iterator(const _Node* __n, const _Hashtable* __tab) :
 238      _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>((_Node*)__n, (_Hashtable*)__tab) {}
 239    _Ht_iterator() {}
 240 -  _Ht_iterator(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __it) :
 241 +  _Ht_iterator(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __it) :
 242      _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>(__it) {}
 243
 244 -  reference operator*() const {
 245 -      return this->_M_cur->_M_val;
 246 +  reference operator*() const {
 247 +      return this->_M_cur->_M_val;
 248    }
 249    _STLP_DEFINE_ARROW_OPERATOR
 250
 251 @@ -138,19 +138,19 @@
 252
 253  template <class _Val, class _Traits, class _Traits1, class _Key, class _HF,
 254            class _ExK, class _EqK, class _All>
 255 -inline bool
 256 -operator==(const _Ht_iterator<_Val, _Traits,_Key,_HF,_ExK,_EqK,_All>& __x,
 257 -          const _Ht_iterator<_Val, _Traits1,_Key,_HF,_ExK,_EqK,_All>& __y) {
 258 -  return __x._M_cur == __y._M_cur;
 259 +inline bool
 260 +operator==(const _Ht_iterator<_Val, _Traits,_Key,_HF,_ExK,_EqK,_All>& __x,
 261 +          const _Ht_iterator<_Val, _Traits1,_Key,_HF,_ExK,_EqK,_All>& __y) {
 262 +  return __x._M_cur == __y._M_cur;
 263  }
 264
 265  #ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
 266  template <class _Val, class _Key, class _HF,
 267            class _ExK, class _EqK, class _All>
 268 -inline bool
 269 -operator!=(const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __x,
 270 -          const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __y) {
 271 -  return __x._M_cur != __y._M_cur;
 272 +inline bool
 273 +operator!=(const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __x,
 274 +          const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __y) {
 275 +  return __x._M_cur != __y._M_cur;
 276  }
 277  #else
 278
 279 @@ -166,10 +166,10 @@
 280
 281  template <class _Val, class _Key, class _HF,
 282            class _ExK, class _EqK, class _All>
 283 -inline bool
 284 -operator!=(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __x,
 285 -          const _Ht_iterator<_Val, _Const_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __y) {
 286 -  return __x._M_cur != __y._M_cur;
 287 +inline bool
 288 +operator!=(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __x,
 289 +          const _Ht_iterator<_Val, _Const_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __y) {
 290 +  return __x._M_cur != __y._M_cur;
 291  }
 292  #endif
 293
 294 @@ -189,8 +189,10 @@
 295    static const size_t _M_list[__stl_num_primes];
 296  };
 297
 298 -# if defined (_STLP_USE_TEMPLATE_EXPORT)
 299 +# if defined (_STLP_USE_TEMPLATE_EXPORT)
 300 +#if ( _MSC_VER < 1300 )
 301  _STLP_EXPORT_TEMPLATE_CLASS _Stl_prime<bool>;
 302 +#endif
 303  # endif
 304
 305  typedef _Stl_prime<bool> _Stl_prime_type;
 306 @@ -200,8 +202,8 @@
 307  //  do.  If we're using standard-conforming allocators, then a hashtable
 308  //  unconditionally has a member variable to hold its allocator, even if
 309  //  it so happens that all instances of the allocator type are identical.
 310 -// This is because, for hashtables, this extra storage is negligible.
 311 -//  Additionally, a base class wouldn't serve any other purposes; it
 312 +// This is because, for hashtables, this extra storage is negligible.
 313 +//  Additionally, a base class wouldn't serve any other purposes; it
 314  //  wouldn't, for example, simplify the exception-handling code.
 315  template <class _Val, class _Key, class _HF,
 316            class _ExK, class _EqK, class _All>
 317 --- misc/STLport-4.5-0119/stlport/stl/_istream.h        Sun Apr  7 04:35:42 2002
 318 +++ misc/build/STLport-4.5-0119/stlport/stl/_istream.h  Mon Jun  2 10:32:02 2008
 319 @@ -257,44 +257,44 @@
 320
 321  template <class _CharT, class _Traits>
 322  inline basic_istream<_CharT, _Traits>& _STLP_CALL
 323 -operator>>(basic_istream<_CharT, _Traits>& __in, _CharT& __c) {
 324 -  __in._M_formatted_get(__c);
 325 -  return __in;
 326 +operator>>(basic_istream<_CharT, _Traits>& ___in, _CharT& __c) {
 327 +  ___in._M_formatted_get(__c);
 328 +  return ___in;
 329  }
 330
 331  template <class _Traits>
 332  inline basic_istream<char, _Traits>& _STLP_CALL
 333 -operator>>(basic_istream<char, _Traits>& __in, unsigned char& __c) {
 334 -  __in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
 335 -  return __in;
 336 +operator>>(basic_istream<char, _Traits>& ___in, unsigned char& __c) {
 337 +  ___in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
 338 +  return ___in;
 339  }
 340
 341  template <class _Traits>
 342  inline basic_istream<char, _Traits>& _STLP_CALL
 343 -operator>>(basic_istream<char, _Traits>& __in, signed char& __c) {
 344 -  __in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
 345 -  return __in;
 346 +operator>>(basic_istream<char, _Traits>& ___in, signed char& __c) {
 347 +  ___in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
 348 +  return ___in;
 349  }
 350
 351  template <class _CharT, class _Traits>
 352  inline basic_istream<_CharT, _Traits>& _STLP_CALL
 353 -operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s) {
 354 -  __in._M_formatted_get(__s);
 355 -  return __in;
 356 +operator>>(basic_istream<_CharT, _Traits>& ___in, _CharT* __s) {
 357 +  ___in._M_formatted_get(__s);
 358 +  return ___in;
 359  }
 360
 361  template <class _Traits>
 362  inline basic_istream<char, _Traits>& _STLP_CALL
 363 -operator>>(basic_istream<char, _Traits>& __in, unsigned char* __s) {
 364 -  __in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
 365 -  return __in;
 366 +operator>>(basic_istream<char, _Traits>& ___in, unsigned char* __s) {
 367 +  ___in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
 368 +  return ___in;
 369  }
 370
 371  template <class _Traits>
 372  inline basic_istream<char, _Traits>& _STLP_CALL
 373 -operator>>(basic_istream<char, _Traits>& __in, signed char* __s) {
 374 -  __in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
 375 -  return __in;
 376 +operator>>(basic_istream<char, _Traits>& ___in, signed char* __s) {
 377 +  ___in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
 378 +  return ___in;
 379  }
 380
 381  //----------------------------------------------------------------------
 382 --- misc/STLport-4.5-0119/stlport/stl/_monetary.c       Thu Sep 12 22:47:00 2002
 383 +++ misc/build/STLport-4.5-0119/stlport/stl/_monetary.c Mon Jun  2 10:32:02 2008
 384 @@ -86,7 +86,7 @@
 385
 386  template <class _InIt, class _OuIt, class _CharT>
 387  bool
 388 -__get_monetary_value(_InIt& __first, _InIt __last, _OuIt __out,
 389 +__get_monetary_value(_InIt& __first, _InIt __last, _OuIt ___out,
 390                       const ctype<_CharT>& _c_type,
 391                       _CharT   __point,
 392                       int      __frac_digits,
 393 @@ -104,7 +104,7 @@
 394    while (__first != __last) {
 395      if (_c_type.is(ctype_base::digit, *__first)) {
 396        ++__current_group_size;
 397 -      *__out++ = *__first++;
 398 +      *___out++ = *__first++;
 399      }
 400      else if (__group_sizes_end) {
 401        if (*__first == __sep) {
 402 @@ -129,7 +129,7 @@
 403
 404      if (__first == __last || *__first != __point) {
 405        for (int __digits = 0; __digits != __frac_digits; ++__digits)
 406 -        *__out++ = _CharT('0');
 407 +        *___out++ = _CharT('0');
 408        return true; // OK not to have decimal point
 409      }
 410    }
 411 @@ -139,7 +139,7 @@
 412    size_t __digits = 0;
 413
 414    while (__first != __last && _c_type.is(ctype_base::digit, *__first)) {
 415 -      *__out++ = *__first++;
 416 +      *___out++ = *__first++;
 417       ++__digits;
 418    }
 419
 420 @@ -202,7 +202,7 @@
 421    bool __is_positive = true;
 422    bool __symbol_required = (__str.flags() & ios_base::showbase) !=0;
 423    string_type __buf;
 424 -  back_insert_iterator<string_type> __out(__buf);
 425 +  back_insert_iterator<string_type> ___out(__buf);
 426  //  pair<iter_type, bool> __result;
 427
 428    for (__i = 0; __i < 4; ++__i) {
 429 @@ -293,7 +293,7 @@
 430        _CharT __sep = __grouping.size() == 0 ? _CharT() :
 431         __intl ? __punct_intl.thousands_sep() : __punct.thousands_sep();
 432
 433 -      __result = __get_monetary_value(__s, __end, __out, __c_type,
 434 +      __result = __get_monetary_value(__s, __end, ___out, __c_type,
 435                                        __point, __frac_digits,
 436                                        __sep,
 437                                        __grouping, __syntax_ok);
 438 --- misc/STLport-4.5-0119/stlport/stl/_num_get.c        Thu Sep 12 22:47:00 2002
 439 +++ misc/build/STLport-4.5-0119/stlport/stl/_num_get.c  Mon Jun  2 10:32:02 2008
 440 @@ -60,7 +60,7 @@
 441
 442  template <class _InputIter, class _CharT>
 443  int
 444 -_M_get_base_or_zero(_InputIter& __in, _InputIter& __end, ios_base& __str, _CharT*)
 445 +_M_get_base_or_zero(_InputIter& ___in, _InputIter& __end, ios_base& __str, _CharT*)
 446  {
 447    _CharT __atoms[5];
 448    const ctype<_CharT>& __c_type = *(const ctype<_CharT>*)__str._M_ctype_facet();
 449 @@ -68,14 +68,14 @@
 450    __c_type.widen(__narrow_atoms, __narrow_atoms + 5, __atoms);
 451
 452    bool __negative = false;
 453 -  _CharT __c = *__in;
 454 +  _CharT __c = *___in;
 455
 456    if (__c == __atoms[1] /* __xminus_char */ ) {
 457      __negative = true;
 458 -    ++__in;
 459 +    ++___in;
 460    }
 461    else if (__c == __atoms[0] /* __xplus_char */ )
 462 -    ++__in;
 463 +    ++___in;
 464
 465
 466    int __base;
 467 @@ -92,21 +92,21 @@
 468      break;
 469    case ios_base::hex:
 470      __base = 16;
 471 -    if (__in != __end && *__in == __atoms[2] /* __zero_char */ ) {
 472 -      ++__in;
 473 -      if (__in != __end &&
 474 -          (*__in == __atoms[3] /* __x_char */ || *__in == __atoms[4] /* __X_char */ ))
 475 -        ++__in;
 476 +    if (___in != __end && *___in == __atoms[2] /* __zero_char */ ) {
 477 +      ++___in;
 478 +      if (___in != __end &&
 479 +          (*___in == __atoms[3] /* __x_char */ || *___in == __atoms[4] /* __X_char */ ))
 480 +        ++___in;
 481        else
 482          __valid_zero = 1; // That zero is valid by itself.
 483      }
 484      break;
 485    default:
 486 -    if (__in != __end && *__in == __atoms[2] /* __zero_char */ ) {
 487 -      ++__in;
 488 -      if (__in != __end &&
 489 -          (*__in == __atoms[3] /* __x_char */ || *__in == __atoms[4] /* __X_char */ )) {
 490 -        ++__in;
 491 +    if (___in != __end && *___in == __atoms[2] /* __zero_char */ ) {
 492 +      ++___in;
 493 +      if (___in != __end &&
 494 +          (*___in == __atoms[3] /* __x_char */ || *___in == __atoms[4] /* __X_char */ )) {
 495 +        ++___in;
 496          __base = 16;
 497        }
 498        else
 499 @@ -252,7 +252,7 @@
 500
 501  template <class _InputIter, class _Integer, class _CharT>
 502  _InputIter _STLP_CALL
 503 -_M_do_get_integer(_InputIter& __in, _InputIter& __end, ios_base& __str,
 504 +_M_do_get_integer(_InputIter& ___in, _InputIter& __end, ios_base& __str,
 505                    ios_base::iostate& __err, _Integer& __val, _CharT* __pc)
 506  {
 507
 508 @@ -265,12 +265,12 @@
 509    const numpunct<_CharT>& __numpunct = *(const numpunct<_CharT>*)__str._M_numpunct_facet();
 510    const string& __grouping = __str._M_grouping(); // cached copy
 511
 512 -  const int __base_or_zero = _M_get_base_or_zero(__in, __end, __str, __pc);
 513 +  const int __base_or_zero = _M_get_base_or_zero(___in, __end, __str, __pc);
 514    int  __got = __base_or_zero & 1;
 515
 516    bool __result;
 517
 518 -  if (__in == __end) {      // We may have already read a 0.  If so,
 519 +  if (___in == __end) {      // We may have already read a 0.  If so,
 520
 521      if (__got > 0) {       // the result is 0 even if we're at eof.
 522        __val = 0;
 523 @@ -285,19 +285,19 @@
 524
 525  #if defined(__HP_aCC) && (__HP_aCC == 1)
 526       if (_IsSigned)
 527 -       __result = __get_integer(__in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __true_type() );
 528 +       __result = __get_integer(___in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __true_type() );
 529       else
 530 -      __result = __get_integer(__in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __false_type() );
 531 +      __result = __get_integer(___in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __false_type() );
 532  #else
 533 -    __result = __get_integer(__in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, _IsSigned());
 534 +    __result = __get_integer(___in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, _IsSigned());
 535  # endif
 536    }
 537
 538    __err = __STATIC_CAST(ios_base::iostate, __result ? ios_base::goodbit : ios_base::failbit);
 539
 540 -  if (__in == __end)
 541 +  if (___in == __end)
 542      __err |= ios_base::eofbit;
 543 -  return __in;
 544 +  return ___in;
 545  }
 546
 547  // _M_read_float and its helper functions.
 548 @@ -376,7 +376,7 @@
 549
 550  template <class _InputIter, class _CharT>
 551  bool _STLP_CALL
 552 -_M_read_float(string& __buf, _InputIter& __in, _InputIter& __end, ios_base& __s, _CharT*)
 553 +_M_read_float(string& __buf, _InputIter& ___in, _InputIter& __end, ios_base& __s, _CharT*)
 554  {
 555    // Create a string, copying characters of the form
 556    // [+-]? [0-9]* .? [0-9]* ([eE] [+-]? [0-9]+)?
 557 @@ -404,20 +404,20 @@
 558    _Initialize_get_float(__ct, __xplus, __xminus, __pow_e, __pow_E, __digits);
 559
 560    // Get an optional sign
 561 -  __in = __copy_sign(__in, __end, __buf, __xplus, __xminus);
 562 +  ___in = __copy_sign(___in, __end, __buf, __xplus, __xminus);
 563
 564    // Get an optional string of digits.
 565    if (__grouping.size() != 0)
 566 -    __digits_before_dot = __copy_grouped_digits(__in, __end, __buf, __digits,
 567 +    __digits_before_dot = __copy_grouped_digits(___in, __end, __buf, __digits,
 568                                                 __sep, __grouping, __grouping_ok);
 569    else
 570 -    __digits_before_dot = __copy_digits(__in, __end, __buf, __digits);
 571 +    __digits_before_dot = __copy_digits(___in, __end, __buf, __digits);
 572
 573    // Get an optional decimal point, and an optional string of digits.
 574 -  if (__in != __end && *__in == __dot) {
 575 +  if (___in != __end && *___in == __dot) {
 576      __buf.push_back('.');
 577 -    ++__in;
 578 -    __digits_after_dot = __copy_digits(__in, __end, __buf, __digits);
 579 +    ++___in;
 580 +    __digits_after_dot = __copy_digits(___in, __end, __buf, __digits);
 581    }
 582
 583    // There have to be some digits, somewhere.
 584 @@ -424,11 +424,11 @@
 585    __ok = __digits_before_dot || __digits_after_dot;
 586
 587    // Get an optional exponent.
 588 -  if (__ok && __in != __end && (*__in == __pow_e || *__in == __pow_E)) {
 589 +  if (__ok && ___in != __end && (*___in == __pow_e || *___in == __pow_E)) {
 590      __buf.push_back('e');
 591 -    ++__in;
 592 -    __in = __copy_sign(__in, __end, __buf, __xplus, __xminus);
 593 -    __ok = __copy_digits(__in, __end, __buf, __digits);
 594 +    ++___in;
 595 +    ___in = __copy_sign(___in, __end, __buf, __xplus, __xminus);
 596 +    __ok = __copy_digits(___in, __end, __buf, __digits);
 597      // If we have an exponent then the sign
 598      // is optional but the digits aren't.
 599    }
 600 @@ -466,7 +466,7 @@
 601  # ifndef _STLP_NO_BOOL
 602  template <class _CharT, class _InputIter>
 603  _InputIter
 604 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end,
 605 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end,
 606                                      ios_base& __s,
 607                                      ios_base::iostate& __err, bool& __x) const
 608  {
 609 @@ -482,8 +482,8 @@
 610      bool __false_ok = true;
 611
 612      size_t __n = 0;
 613 -    for ( ; __in != __end; ++__in) {
 614 -      _CharT __c = *__in;
 615 +    for ( ; ___in != __end; ++___in) {
 616 +      _CharT __c = *___in;
 617        __true_ok  = __true_ok  && (__c == __truename[__n]);
 618        __false_ok = __false_ok && (__c == __falsename[__n]);
 619        ++__n;
 620 @@ -491,7 +491,7 @@
 621        if ((!__true_ok && !__false_ok) ||
 622            (__true_ok  && __n >= __truename.size()) ||
 623            (__false_ok && __n >= __falsename.size())) {
 624 -       ++__in;
 625 +       ++___in;
 626          break;
 627        }
 628      }
 629 @@ -505,15 +505,15 @@
 630      else
 631        __err = ios_base::failbit;
 632
 633 -    if (__in == __end)
 634 +    if (___in == __end)
 635        __err |= ios_base::eofbit;
 636
 637 -    return __in;
 638 +    return ___in;
 639    }
 640
 641    else {
 642      long __lx;
 643 -    _InputIter __tmp = this->do_get(__in, __end, __s, __err, __lx);
 644 +    _InputIter __tmp = this->do_get(___in, __end, __s, __err, __lx);
 645      if (!(__err & ios_base::failbit)) {
 646        if (__lx == 0)
 647          __x = false;
 648 @@ -531,16 +531,16 @@
 649  # ifdef _STLP_FIX_LIBRARY_ISSUES
 650  template <class _CharT, class _InputIter>
 651  _InputIter
 652 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 653 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 654                                      ios_base::iostate& __err, short& __val) const {
 655 -  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
 656 +  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
 657  }
 658
 659  template <class _CharT, class _InputIter>
 660  _InputIter
 661 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 662 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 663                                      ios_base::iostate& __err, int& __val) const {
 664 -  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
 665 +  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
 666  }
 667
 668  # endif
 669 @@ -547,83 +547,83 @@
 670
 671  template <class _CharT, class _InputIter>
 672  _InputIter
 673 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 674 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 675                                      ios_base::iostate& __err, long& __val) const {
 676 -  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
 677 +  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
 678  }
 679
 680  template <class _CharT, class _InputIter>
 681  _InputIter
 682 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 683 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 684                                      ios_base::iostate& __err,
 685                                      unsigned short& __val) const {
 686 -  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
 687 +  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
 688  }
 689
 690  template <class _CharT, class _InputIter>
 691  _InputIter
 692 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 693 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 694                                      ios_base::iostate& __err,
 695                                      unsigned int& __val) const {
 696 -  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
 697 +  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
 698  }
 699
 700  template <class _CharT, class _InputIter>
 701  _InputIter
 702 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 703 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 704                                      ios_base::iostate& __err,
 705                                      unsigned long& __val) const {
 706 -  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
 707 +  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
 708  }
 709
 710
 711  template <class _CharT, class _InputIter>
 712  _InputIter
 713 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 714 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 715                                      ios_base::iostate& __err,
 716                                      float& __val) const {
 717    string __buf ;
 718 -  bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
 719 +  bool __ok = _M_read_float(__buf, ___in, __end, __str, (_CharT*)0 );
 720    __string_to_float(__buf, __val);
 721    __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
 722 -  if (__in == __end)
 723 +  if (___in == __end)
 724      __err |= ios_base::eofbit;
 725 -  return __in;
 726 +  return ___in;
 727  }
 728
 729  template <class _CharT, class _InputIter>
 730  _InputIter
 731 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 732 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 733                                      ios_base::iostate& __err,
 734                                      double& __val) const {
 735    string __buf ;
 736 -  bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
 737 +  bool __ok = _M_read_float(__buf, ___in, __end, __str, (_CharT*)0 );
 738    __string_to_float(__buf, __val);
 739    __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
 740 -  if (__in == __end)
 741 +  if (___in == __end)
 742      __err |= ios_base::eofbit;
 743 -  return __in;
 744 +  return ___in;
 745  }
 746
 747  #ifndef _STLP_NO_LONG_DOUBLE
 748  template <class _CharT, class _InputIter>
 749  _InputIter
 750 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 751 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 752                                     ios_base::iostate& __err,
 753                                      long double& __val) const {
 754    string __buf ;
 755 -  bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
 756 +  bool __ok = _M_read_float(__buf, ___in, __end, __str, (_CharT*)0 );
 757    __string_to_float(__buf, __val);
 758    __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
 759 -  if (__in == __end)
 760 +  if (___in == __end)
 761      __err |= ios_base::eofbit;
 762 -  return __in;
 763 +  return ___in;
 764  }
 765  #endif /* _STLP_LONG_DOUBLE */
 766
 767  template <class _CharT, class _InputIter>
 768  _InputIter
 769 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 770 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 771                             ios_base::iostate& __err,
 772                             void*& __p) const {
 773  # if defined(_STLP_LONG_LONG)&&!defined(__MRC__)               //*ty 12/07/2001 - MrCpp can not cast from long long to void*
 774 @@ -631,7 +631,7 @@
 775  # else
 776    unsigned long __val;
 777  # endif
 778 -    iter_type __tmp = _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
 779 +    iter_type __tmp = _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
 780      if (!(__err & ios_base::failbit))
 781        __p = __REINTERPRET_CAST(void*,__val);
 782      return __tmp;
 783 @@ -642,18 +642,18 @@
 784
 785  template <class _CharT, class _InputIter>
 786  _InputIter
 787 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 788 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 789                                      ios_base::iostate& __err,
 790                                      _STLP_LONG_LONG& __val) const {
 791 -  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
 792 +  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
 793  }
 794
 795  template <class _CharT, class _InputIter>
 796  _InputIter
 797 -num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 798 +num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 799                                      ios_base::iostate& __err,
 800                                      unsigned _STLP_LONG_LONG& __val) const {
 801 -  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
 802 +  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
 803  }
 804
 805  #endif /* _STLP_LONG_LONG */
 806 --- misc/STLport-4.5-0119/stlport/stl/_num_get.h        Mon Nov 26 19:37:00 2001
 807 +++ misc/build/STLport-4.5-0119/stlport/stl/_num_get.h  Mon Jun  2 10:32:02 2008
 808 @@ -58,79 +58,79 @@
 809    explicit num_get(size_t __refs = 0): locale::facet(__refs) {}
 810
 811  # ifndef _STLP_NO_BOOL
 812 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 813 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 814                  ios_base::iostate& __err, bool& __val) const {
 815 -    return do_get(__in, __end, __str, __err, __val);
 816 +    return do_get(___in, __end, __str, __err, __val);
 817    }
 818  # endif
 819
 820  # ifdef _STLP_FIX_LIBRARY_ISSUES
 821 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 822 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 823                  ios_base::iostate& __err, short& __val) const {
 824 -    return do_get(__in, __end, __str, __err, __val);
 825 +    return do_get(___in, __end, __str, __err, __val);
 826    }
 827
 828 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 829 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 830                  ios_base::iostate& __err, int& __val) const {
 831 -    return do_get(__in, __end, __str, __err, __val);
 832 +    return do_get(___in, __end, __str, __err, __val);
 833    }
 834  # endif
 835
 836 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 837 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 838                  ios_base::iostate& __err, long& __val) const {
 839 -    return do_get(__in, __end, __str, __err, __val);
 840 +    return do_get(___in, __end, __str, __err, __val);
 841    }
 842
 843 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 844 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 845                  ios_base::iostate& __err, unsigned short& __val) const {
 846 -    return do_get(__in, __end, __str, __err, __val);
 847 +    return do_get(___in, __end, __str, __err, __val);
 848    }
 849
 850 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 851 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 852                  ios_base::iostate& __err, unsigned int& __val) const {
 853 -    return do_get(__in, __end, __str, __err, __val);
 854 +    return do_get(___in, __end, __str, __err, __val);
 855    }
 856
 857 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 858 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 859                  ios_base::iostate& __err, unsigned long& __val) const {
 860 -    return do_get(__in, __end, __str, __err, __val);
 861 +    return do_get(___in, __end, __str, __err, __val);
 862    }
 863
 864  #ifdef _STLP_LONG_LONG
 865
 866 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 867 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 868                  ios_base::iostate& __err, _STLP_LONG_LONG& __val) const {
 869 -    return do_get(__in, __end, __str, __err, __val);
 870 +    return do_get(___in, __end, __str, __err, __val);
 871    }
 872
 873 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 874 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 875                  ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const {
 876 -    return do_get(__in, __end, __str, __err, __val);
 877 +    return do_get(___in, __end, __str, __err, __val);
 878    }
 879
 880  #endif /* _STLP_LONG_LONG */
 881
 882 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 883 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 884                   ios_base::iostate& __err, float& __val) const {
 885 -    return do_get(__in, __end, __str, __err, __val);
 886 +    return do_get(___in, __end, __str, __err, __val);
 887    }
 888
 889 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 890 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 891                  ios_base::iostate& __err, double& __val) const {
 892 -    return do_get(__in, __end, __str, __err, __val);
 893 +    return do_get(___in, __end, __str, __err, __val);
 894    }
 895
 896  # ifndef _STLP_NO_LONG_DOUBLE
 897
 898 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 899 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 900                  ios_base::iostate& __err, long double& __val) const {
 901 -    return do_get(__in, __end, __str, __err, __val);
 902 +    return do_get(___in, __end, __str, __err, __val);
 903    }
 904  # endif
 905
 906 -  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
 907 +  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
 908                  ios_base::iostate& __err, void*& __val) const {
 909 -    return do_get(__in, __end, __str, __err, __val);
 910 +    return do_get(___in, __end, __str, __err, __val);
 911    }
 912
 913    _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
 914 @@ -143,43 +143,43 @@
 915    typedef numpunct<_CharT>     _Numpunct;
 916
 917  # ifndef _STLP_NO_BOOL
 918 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end,
 919 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end,
 920                             ios_base& __str, ios_base::iostate& __err, bool& __val) const;
 921  # endif
 922
 923 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 924 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 925                             ios_base::iostate& __err, long& __val) const;
 926 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 927 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 928                             ios_base::iostate& __err, unsigned short& __val) const;
 929 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 930 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 931                             ios_base::iostate& __err, unsigned int& __val) const;
 932 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 933 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 934                             ios_base::iostate& __err, unsigned long& __val) const;
 935  # ifdef _STLP_FIX_LIBRARY_ISSUES
 936    // issue 118 : those are actually not supposed to be here
 937 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 938 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 939                             ios_base::iostate& __err, short& __val) const;
 940 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 941 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 942                             ios_base::iostate& __err, int& __val) const;
 943  # endif
 944 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 945 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 946                            ios_base::iostate& __err, float& __val) const;
 947 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 948 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 949                             ios_base::iostate& __err, double& __val) const;
 950 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 951 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 952                             ios_base::iostate& __err,
 953                             void*& __p) const;
 954
 955  #ifndef _STLP_NO_LONG_DOUBLE
 956 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 957 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 958                             ios_base::iostate& __err, long double& __val) const;
 959  #endif /* _STLP_LONG_DOUBLE */
 960
 961  #ifdef _STLP_LONG_LONG
 962
 963 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 964 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 965                              ios_base::iostate& __err, _STLP_LONG_LONG& __val) const;
 966 -  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
 967 +  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
 968                             ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const;
 969  #endif /* _STLP_LONG_LONG */
 970
 971 --- misc/STLport-4.5-0119/stlport/stl/_num_put.c        Thu Sep 12 22:47:01 2002
 972 +++ misc/build/STLport-4.5-0119/stlport/stl/_num_put.c  Mon Jun  2 10:32:02 2008
 973 @@ -45,29 +45,29 @@
 974  template <class _CharT, class _OutputIter>
 975  _OutputIter  _STLP_CALL
 976  __copy_float_and_fill(const _CharT* __first, const _CharT* __last,
 977 -                      _OutputIter __out,
 978 +                      _OutputIter ___out,
 979                        ios_base::fmtflags __flags,
 980                        streamsize __width, _CharT __fill,
 981                        _CharT __xplus, _CharT __xminus) {
 982    if (__width <= __last - __first)
 983 -    return copy(__first, __last, __out);
 984 +    return copy(__first, __last, ___out);
 985    else {
 986      streamsize __pad = __width - (__last - __first);
 987      ios_base::fmtflags __dir = __flags & ios_base::adjustfield;
 988
 989      if (__dir == ios_base::left) {
 990 -      __out = copy(__first, __last, __out);
 991 -      return fill_n(__out, __pad, __fill);
 992 +      ___out = copy(__first, __last, ___out);
 993 +      return fill_n(___out, __pad, __fill);
 994      }
 995      else if (__dir == ios_base::internal && __first != __last &&
 996               (*__first == __xplus || *__first == __xminus)) {
 997 -      *__out++ = *__first++;
 998 -      __out = fill_n(__out, __pad, __fill);
 999 -      return copy(__first, __last, __out);
1000 +      *___out++ = *__first++;
1001 +      ___out = fill_n(___out, __pad, __fill);
1002 +      return copy(__first, __last, ___out);
1003      }
1004      else {
1005 -      __out = fill_n(__out, __pad, __fill);
1006 -      return copy(__first, __last, __out);
1007 +      ___out = fill_n(___out, __pad, __fill);
1008 +      return copy(__first, __last, ___out);
1009      }
1010    }
1011  }
1012 @@ -76,7 +76,7 @@
1013  // Helper routine for wchar_t
1014  template <class _OutputIter>
1015  _OutputIter  _STLP_CALL
1016 -__put_float(char* __ibuf, char* __iend, _OutputIter __out,
1017 +__put_float(char* __ibuf, char* __iend, _OutputIter ___out,
1018              ios_base& __f, wchar_t __fill,
1019              wchar_t __decimal_point,
1020              wchar_t __sep, const string& __grouping)
1021 @@ -107,7 +107,7 @@
1022      __eend = __wbuf + __len;
1023    }
1024
1025 -  return __copy_float_and_fill(__wbuf, __eend, __out,
1026 +  return __copy_float_and_fill(__wbuf, __eend, ___out,
1027                                 __f.flags(), __f.width(0), __fill,
1028                                 __ct.widen('+'), __ct.widen('-'));
1029  }
1030 @@ -116,7 +116,7 @@
1031  // Helper routine for char
1032  template <class _OutputIter>
1033  _OutputIter  _STLP_CALL
1034 -__put_float(char* __ibuf, char* __iend, _OutputIter __out,
1035 +__put_float(char* __ibuf, char* __iend, _OutputIter ___out,
1036              ios_base& __f, char __fill,
1037              char __decimal_point,
1038              char __sep, const string& __grouping)
1039 @@ -133,7 +133,7 @@
1040      __iend = __ibuf + __len;
1041    }
1042
1043 -  return __copy_float_and_fill(__ibuf, __iend, __out,
1044 +  return __copy_float_and_fill(__ibuf, __iend, ___out,
1045                                 __f.flags(), __f.width(0), __fill, '+', '-');
1046  }
1047
1048 @@ -158,37 +158,37 @@
1049  template <class _CharT, class _OutputIter>
1050  _OutputIter _STLP_CALL
1051  __copy_integer_and_fill(const _CharT* __buf, ptrdiff_t __len,
1052 -                        _OutputIter __out,
1053 +                        _OutputIter ___out,
1054                          ios_base::fmtflags __flg, streamsize __wid, _CharT __fill,
1055                          _CharT __xplus, _CharT __xminus)
1056  {
1057    if (__len >= __wid)
1058 -    return copy(__buf, __buf + __len, __out);
1059 +    return copy(__buf, __buf + __len, ___out);
1060    else {
1061      ptrdiff_t __pad = __wid - __len;
1062      ios_base::fmtflags __dir = __flg & ios_base::adjustfield;
1063
1064      if (__dir == ios_base::left) {
1065 -      __out = copy(__buf, __buf + __len, __out);
1066 -      return fill_n(__out, __pad, __fill);
1067 +      ___out = copy(__buf, __buf + __len, ___out);
1068 +      return fill_n(___out, __pad, __fill);
1069      }
1070      else if (__dir == ios_base::internal && __len != 0 &&
1071               (__buf[0] == __xplus || __buf[0] == __xminus)) {
1072 -      *__out++ = __buf[0];
1073 -      __out = fill_n(__out, __pad, __fill);
1074 -      return copy(__buf + 1, __buf + __len, __out);
1075 +      *___out++ = __buf[0];
1076 +      ___out = fill_n(___out, __pad, __fill);
1077 +      return copy(__buf + 1, __buf + __len, ___out);
1078      }
1079      else if (__dir == ios_base::internal && __len >= 2 &&
1080               (__flg & ios_base::showbase) &&
1081               (__flg & ios_base::basefield) == ios_base::hex) {
1082 -      *__out++ = __buf[0];
1083 -      *__out++ = __buf[1];
1084 -      __out = fill_n(__out, __pad, __fill);
1085 -      return copy(__buf + 2, __buf + __len, __out);
1086 +      *___out++ = __buf[0];
1087 +      *___out++ = __buf[1];
1088 +      ___out = fill_n(___out, __pad, __fill);
1089 +      return copy(__buf + 2, __buf + __len, ___out);
1090      }
1091      else {
1092 -      __out = fill_n(__out, __pad, __fill);
1093 -      return copy(__buf, __buf + __len, __out);
1094 +      ___out = fill_n(___out, __pad, __fill);
1095 +      return copy(__buf, __buf + __len, ___out);
1096      }
1097    }
1098  }
1099 --- misc/STLport-4.5-0119/stlport/stl/_sstream.c        Thu Sep 12 22:47:04 2002
1100 +++ misc/build/STLport-4.5-0119/stlport/stl/_sstream.c  Mon Jun  2 10:32:02 2008
1101 @@ -337,22 +337,22 @@
1102              ios_base::seekdir __dir,
1103              ios_base::openmode __mode)
1104  {
1105 -  bool __in  = false;
1106 -  bool __out = false;
1107 +  bool ___in  = false;
1108 +  bool ___out = false;
1109
1110    if ((__mode & (ios_base::in | ios_base::out)) == (ios_base::in | ios_base::out) ) {
1111      if (__dir == ios_base::beg || __dir == ios_base::end)
1112 -      __in = __out = true;
1113 +      ___in = ___out = true;
1114    }
1115    else if (__mode & ios_base::in)
1116 -    __in = true;
1117 +    ___in = true;
1118    else if (__mode & ios_base::out)
1119 -    __out = true;
1120 +    ___out = true;
1121
1122 -  if (!__in && !__out)
1123 +  if (!___in && !___out)
1124      return pos_type(off_type(-1));
1125 -  else if ((__in  && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
1126 -           (__out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
1127 +  else if ((___in  && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
1128 +           (___out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
1129      return pos_type(off_type(-1));
1130
1131    if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
1132 @@ -367,7 +367,7 @@
1133      __newoff = _M_str.size();
1134      break;
1135    case ios_base::cur:
1136 -    __newoff = __in ? this->gptr() - this->eback()
1137 +    __newoff = ___in ? this->gptr() - this->eback()
1138                      : this->pptr() - this->pbase();
1139      break;
1140    default:
1141 @@ -376,7 +376,7 @@
1142
1143    __off += __newoff;
1144
1145 -  if (__in) {
1146 +  if (___in) {
1147      ptrdiff_t __n = this->egptr() - this->eback();
1148
1149      if (__off < 0 || __off > __n)
1150 @@ -385,7 +385,7 @@
1151        this->setg(this->eback(), this->eback() + __off, this->eback() + __n);
1152    }
1153
1154 -  if (__out) {
1155 +  if (___out) {
1156      ptrdiff_t __n = this->epptr() - this->pbase();
1157
1158      if (__off < 0 || __off > __n)
1159 @@ -404,11 +404,11 @@
1160  basic_stringbuf<_CharT, _Traits, _Alloc>
1161    ::seekpos(pos_type __pos, ios_base::openmode __mode)
1162  {
1163 -  bool __in  = (__mode & ios_base::in) != 0;
1164 -  bool __out = (__mode & ios_base::out) != 0;
1165 +  bool ___in  = (__mode & ios_base::in) != 0;
1166 +  bool ___out = (__mode & ios_base::out) != 0;
1167
1168 -  if ((__in  && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
1169 -      (__out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
1170 +  if ((___in  && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
1171 +      (___out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
1172      return pos_type(off_type(-1));
1173
1174    const off_type __n = __pos - pos_type(off_type(0));
1175 @@ -415,13 +415,13 @@
1176    if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
1177      _M_append_buffer();
1178
1179 -  if (__in) {
1180 +  if (___in) {
1181      if (__n < 0 || __n > this->egptr() - this->eback())
1182        return pos_type(off_type(-1));
1183      this->setg(this->eback(), this->eback() + __n, this->egptr());
1184    }
1185
1186 -  if (__out) {
1187 +  if (___out) {
1188      if (__n < 0 || size_t(__n) > _M_str.size())
1189        return pos_type(off_type(-1));
1190
1191 --- misc/STLport-4.5-0119/stlport/stl/_time_facets.c    Thu Sep 12 22:47:07 2002
1192 +++ misc/build/STLport-4.5-0119/stlport/stl/_time_facets.c      Mon Jun  2 10:32:02 2008
1193 @@ -328,7 +328,7 @@
1194  # ifndef _STLP_NO_WCHAR_T
1195  template <class _OuIt>
1196  _OuIt _STLP_CALL
1197 -__put_time(char * __first, char * __last, _OuIt __out,
1198 +__put_time(char * __first, char * __last, _OuIt ___out,
1199             const ios_base& __s, wchar_t) {
1200      const ctype<wchar_t>& __ct = *(ctype<wchar_t>*)__s._M_ctype_facet();
1201      wchar_t __wbuf[64];
1202 @@ -335,7 +335,7 @@
1203      __ct.widen(__first, __last, __wbuf);
1204      ptrdiff_t __len = __last - __first;
1205      wchar_t * __eend = __wbuf + __len;
1206 -    return copy((wchar_t*)__wbuf, __eend, __out);
1207 +    return copy((wchar_t*)__wbuf, __eend, ___out);
1208  }
1209  # endif
1210
1211 --- misc/STLport-4.5-0119/stlport/stl/_time_facets.h    Wed Aug 29 00:55:47 2001
1212 +++ misc/build/STLport-4.5-0119/stlport/stl/_time_facets.h      Mon Jun  2 10:32:02 2008
1213 @@ -198,14 +198,14 @@
1214                         const _Time_Info& __table, const tm* __t);
1215
1216  template <class _OuIt>
1217 -inline _OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt __out,
1218 +inline _OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt ___out,
1219                                     const ios_base& /* __loc */, char) {
1220 -    return copy(__first, __last, __out);
1221 +    return copy(__first, __last, ___out);
1222  }
1223
1224  # ifndef _STLP_NO_WCHAR_T
1225  template <class _OuIt>
1226 -_OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt __out,
1227 +_OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt ___out,
1228                              const ios_base& __s, wchar_t);
1229  # endif
1230
1231 --- misc/STLport-4.5-0119/stlport/stl/debug/_debug.c    Thu Sep 12 22:47:08 2002
1232 +++ misc/build/STLport-4.5-0119/stlport/stl/debug/_debug.c      Mon Jun  2 10:32:02 2008
1233 @@ -82,7 +82,7 @@
1234  template <class _Iterator>
1235  bool _STLP_CALL  __check_range(const _Iterator& __it,
1236                                 const _Iterator& __start, const _Iterator& __finish) {
1237 -    _STLP_VERBOSE_RETURN(__in_range(__it,__start, __finish),
1238 +    _STLP_VERBOSE_RETURN(___in_range(__it,__start, __finish),
1239                           _StlMsg_NOT_IN_RANGE_1)
1240      return true;
1241  }
1242 @@ -90,7 +90,7 @@
1243  template <class _Iterator>
1244  bool _STLP_CALL  __check_range(const _Iterator& __first, const _Iterator& __last,
1245                                 const _Iterator& __start, const _Iterator& __finish) {
1246 -    _STLP_VERBOSE_RETURN(__in_range(__first, __last, __start, __finish),
1247 +    _STLP_VERBOSE_RETURN(___in_range(__first, __last, __start, __finish),
1248                           _StlMsg_NOT_IN_RANGE_2)
1249      return true;
1250  }
1251 --- misc/STLport-4.5-0119/stlport/stl/debug/_debug.h    Thu Sep 12 22:47:09 2002
1252 +++ misc/build/STLport-4.5-0119/stlport/stl/debug/_debug.h      Mon Jun  2 10:32:03 2008
1253 @@ -227,7 +227,7 @@
1254
1255  // Note : that means in range [i1, i2].
1256  template <class _Iterator>
1257 -inline bool  _STLP_CALL __in_range(const _Iterator& _It, const _Iterator& __i1,
1258 +inline bool  _STLP_CALL ___in_range(const _Iterator& _It, const _Iterator& __i1,
1259                                     const _Iterator& __i2) {
1260      return __valid_range(__i1,_It,_STLP_ITERATOR_CATEGORY(__i1, _Iterator)) &&
1261          __valid_range(_It,__i2,_STLP_ITERATOR_CATEGORY(_It, _Iterator));
1262 @@ -234,7 +234,7 @@
1263  }
1264
1265  template <class _Iterator>
1266 -inline bool  _STLP_CALL __in_range(const _Iterator& __first, const _Iterator& __last,
1267 +inline bool  _STLP_CALL ___in_range(const _Iterator& __first, const _Iterator& __last,
1268                                     const _Iterator& __start, const _Iterator& __finish) {
1269      return __valid_range(__first,__last,_STLP_ITERATOR_CATEGORY(__first, _Iterator)) &&
1270          __valid_range(__start,__first,_STLP_ITERATOR_CATEGORY(__first, _Iterator)) &&
1271 --- misc/STLport-4.5-0119/stlport/stl/debug/_deque.h    Fri May  4 04:11:54 2001
1272 +++ misc/build/STLport-4.5-0119/stlport/stl/debug/_deque.h      Mon Jun  2 10:32:03 2008
1273 @@ -121,9 +121,9 @@
1274    explicit _DBG_deque(const allocator_type& __a = allocator_type()) :
1275      _STLP_DEQUE_SUPER(__a), _M_iter_list(_Get_base()) {}
1276    _DBG_deque(const _Self& __x) : _STLP_DEQUE_SUPER(__x), _M_iter_list(_Get_base()) {}
1277 -  _DBG_deque(size_type __n, const value_type& __value,
1278 +  _DBG_deque(size_type __n, const value_type& ___value,
1279          const allocator_type& __a = allocator_type()) :
1280 -    _STLP_DEQUE_SUPER(__n, __value, __a), _M_iter_list(_Get_base()) {}
1281 +    _STLP_DEQUE_SUPER(__n, ___value, __a), _M_iter_list(_Get_base()) {}
1282    explicit _DBG_deque(size_type __n) : _STLP_DEQUE_SUPER(__n), _M_iter_list(_Get_base()) {}
1283
1284  #ifdef _STLP_MEMBER_TEMPLATES
1285 --- misc/STLport-4.5-0119/stlport/stl/debug/_list.h     Wed May 30 05:45:43 2001
1286 +++ misc/build/STLport-4.5-0119/stlport/stl/debug/_list.h       Mon Jun  2 10:32:03 2008
1287 @@ -79,9 +79,9 @@
1288    _Base* _Get_base() { return (_Base*)this; }
1289    explicit _DBG_list(const allocator_type& __a = allocator_type()) :
1290      _STLP_DBG_LIST_BASE(__a), _M_iter_list(_Get_base()) {}
1291 -  _DBG_list(size_type __n, const _Tp& __value,
1292 +  _DBG_list(size_type __n, const _Tp& ___value,
1293             const allocator_type& __a = allocator_type())
1294 -    : _STLP_DBG_LIST_BASE(__n, __value, __a), _M_iter_list(_Get_base()) {}
1295 +    : _STLP_DBG_LIST_BASE(__n, ___value, __a), _M_iter_list(_Get_base()) {}
1296    explicit _DBG_list(size_type __n)
1297      : _STLP_DBG_LIST_BASE(__n), _M_iter_list(_Get_base()) {}
1298
1299 @@ -219,13 +219,13 @@
1300
1301    void resize(size_type __new_size) { this->resize(__new_size, _Tp()); }
1302
1303 -  void remove(const _Tp& __value) {
1304 +  void remove(const _Tp& ___value) {
1305      typename _Base::iterator __first = _Base::begin();
1306      typename _Base::iterator __last = _Base::end();
1307      while (__first != __last) {
1308        typename _Base::iterator __next = __first;
1309        ++__next;
1310 -      if (__value == *__first) erase(iterator(&_M_iter_list,__first));
1311 +      if (___value == *__first) erase(iterator(&_M_iter_list,__first));
1312        __first = __next;
1313      }
1314    }
1315 --- misc/STLport-4.5-0119/stlport/stl/debug/_vector.h   Mon Oct 28 16:09:32 2002
1316 +++ misc/build/STLport-4.5-0119/stlport/stl/debug/_vector.h     Mon Jun  2 10:32:03 2008
1317 @@ -141,9 +141,9 @@
1318    explicit _DBG_vector(const allocator_type& __a = allocator_type())
1319      : _STLP_DBG_VECTOR_BASE(__a), _M_iter_list((const _Base*)this)  {}
1320
1321 -  _DBG_vector(size_type __n, const _Tp& __value,
1322 +  _DBG_vector(size_type __n, const _Tp& ___value,
1323           const allocator_type& __a = allocator_type())
1324 -    : _STLP_DBG_VECTOR_BASE(__n, __value, __a), _M_iter_list((const _Base*)this) {}
1325 +    : _STLP_DBG_VECTOR_BASE(__n, ___value, __a), _M_iter_list((const _Base*)this) {}
1326
1327    explicit _DBG_vector(size_type __n)
1328      : _STLP_DBG_VECTOR_BASE(__n), _M_iter_list((const _Base*)this) {}