1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_tempbuf.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_tempbuf.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -9,13 +9,13 @@
     1.4   * Copyright (c) 1997
     1.5   * Moscow Center for SPARC Technology
     1.6   *
     1.7 - * Copyright (c) 1999 
     1.8 + * Copyright (c) 1999
     1.9   * Boris Fomitchev
    1.10   *
    1.11   * This material is provided "as is", with absolutely no warranty expressed
    1.12   * or implied. Any use is at your own risk.
    1.13   *
    1.14 - * Permission to use or copy this software for any purpose is hereby granted 
    1.15 + * Permission to use or copy this software for any purpose is hereby granted
    1.16   * without fee, provided the above notices are retained on all copies.
    1.17   * Permission to modify the code and to distribute modified code is granted,
    1.18   * provided the above notices are retained, and a notice that the code was
    1.19 @@ -30,15 +30,17 @@
    1.20  #ifndef _STLP_INTERNAL_TEMPBUF_H
    1.21  #define _STLP_INTERNAL_TEMPBUF_H
    1.22  
    1.23 -# ifndef _STLP_CLIMITS
    1.24 +#ifndef _STLP_CLIMITS
    1.25  #  include <climits>
    1.26 -# endif
    1.27 -# ifndef _STLP_CSTDLIB
    1.28 -#  include <cstdlib>
    1.29 -# endif
    1.30 -# ifndef _STLP_INTERNAL_UNINITIALIZED_H
    1.31 +#endif
    1.32 +
    1.33 +#ifndef _STLP_INTERNAL_CSTDLIB
    1.34 +#  include <stl/_cstdlib.h>
    1.35 +#endif
    1.36 +
    1.37 +#ifndef _STLP_INTERNAL_UNINITIALIZED_H
    1.38  #  include <stl/_uninitialized.h>
    1.39 -# endif
    1.40 +#endif
    1.41  
    1.42  _STLP_BEGIN_NAMESPACE
    1.43  
    1.44 @@ -111,7 +113,7 @@
    1.45  #   if defined(__sgi) && !defined(__GNUC__) && _COMPILER_VERSION < 730
    1.46      typedef typename __type_traits<_Tp>::is_POD_type _Trivial;
    1.47  #   else
    1.48 -     typedef typename __type_traits<_Tp>::has_trivial_default_constructor  _Trivial;
    1.49 +    typedef typename __type_traits<_Tp>::has_trivial_default_constructor  _Trivial;
    1.50  #   endif
    1.51      _STLP_TRY {
    1.52        _M_len = distance(__first, __last);
    1.53 @@ -119,11 +121,11 @@
    1.54        if (_M_len > 0)
    1.55          _M_initialize_buffer(*__first, _Trivial());
    1.56      }
    1.57 -    _STLP_UNWIND(free(_M_buffer); _M_buffer = 0; _M_len = 0);
    1.58 +    _STLP_UNWIND(free(_M_buffer); _M_buffer = 0; _M_len = 0)
    1.59    }
    1.60 - 
    1.61 -  ~_Temporary_buffer() {  
    1.62 -    _STLP_STD::_Destroy(_M_buffer, _M_buffer + _M_len);
    1.63 +
    1.64 +  ~_Temporary_buffer() {
    1.65 +    _STLP_STD::_Destroy_Range(_M_buffer, _M_buffer + _M_len);
    1.66      free(_M_buffer);
    1.67    }
    1.68  
    1.69 @@ -137,8 +139,8 @@
    1.70  
    1.71  // Class temporary_buffer is not part of the standard.  It is an extension.
    1.72  
    1.73 -template <class _ForwardIterator, 
    1.74 -          class _Tp 
    1.75 +template <class _ForwardIterator,
    1.76 +          class _Tp
    1.77  #ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
    1.78                      = typename iterator_traits<_ForwardIterator>::value_type
    1.79  #endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
    1.80 @@ -151,7 +153,7 @@
    1.81  };
    1.82  
    1.83  # endif /* _STLP_NO_EXTENSIONS */
    1.84 -    
    1.85 +
    1.86  _STLP_END_NAMESPACE
    1.87  
    1.88  # ifndef _STLP_LINK_TIME_INSTANTIATION