diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_tempbuf.h
--- a/epoc32/include/stdapis/stlportv5/stl/_tempbuf.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/stdapis/stlportv5/stl/_tempbuf.h	Wed Mar 31 12:33:34 2010 +0100
@@ -9,13 +9,13 @@
  * Copyright (c) 1997
  * Moscow Center for SPARC Technology
  *
- * Copyright (c) 1999 
+ * Copyright (c) 1999
  * Boris Fomitchev
  *
  * This material is provided "as is", with absolutely no warranty expressed
  * or implied. Any use is at your own risk.
  *
- * Permission to use or copy this software for any purpose is hereby granted 
+ * Permission to use or copy this software for any purpose is hereby granted
  * without fee, provided the above notices are retained on all copies.
  * Permission to modify the code and to distribute modified code is granted,
  * provided the above notices are retained, and a notice that the code was
@@ -30,15 +30,17 @@
 #ifndef _STLP_INTERNAL_TEMPBUF_H
 #define _STLP_INTERNAL_TEMPBUF_H
 
-# ifndef _STLP_CLIMITS
+#ifndef _STLP_CLIMITS
 #  include <climits>
-# endif
-# ifndef _STLP_CSTDLIB
-#  include <cstdlib>
-# endif
-# ifndef _STLP_INTERNAL_UNINITIALIZED_H
+#endif
+
+#ifndef _STLP_INTERNAL_CSTDLIB
+#  include <stl/_cstdlib.h>
+#endif
+
+#ifndef _STLP_INTERNAL_UNINITIALIZED_H
 #  include <stl/_uninitialized.h>
-# endif
+#endif
 
 _STLP_BEGIN_NAMESPACE
 
@@ -111,7 +113,7 @@
 #   if defined(__sgi) && !defined(__GNUC__) && _COMPILER_VERSION < 730
     typedef typename __type_traits<_Tp>::is_POD_type _Trivial;
 #   else
-     typedef typename __type_traits<_Tp>::has_trivial_default_constructor  _Trivial;
+    typedef typename __type_traits<_Tp>::has_trivial_default_constructor  _Trivial;
 #   endif
     _STLP_TRY {
       _M_len = distance(__first, __last);
@@ -119,11 +121,11 @@
       if (_M_len > 0)
         _M_initialize_buffer(*__first, _Trivial());
     }
-    _STLP_UNWIND(free(_M_buffer); _M_buffer = 0; _M_len = 0);
+    _STLP_UNWIND(free(_M_buffer); _M_buffer = 0; _M_len = 0)
   }
- 
-  ~_Temporary_buffer() {  
-    _STLP_STD::_Destroy(_M_buffer, _M_buffer + _M_len);
+
+  ~_Temporary_buffer() {
+    _STLP_STD::_Destroy_Range(_M_buffer, _M_buffer + _M_len);
     free(_M_buffer);
   }
 
@@ -137,8 +139,8 @@
 
 // Class temporary_buffer is not part of the standard.  It is an extension.
 
-template <class _ForwardIterator, 
-          class _Tp 
+template <class _ForwardIterator,
+          class _Tp
 #ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
                     = typename iterator_traits<_ForwardIterator>::value_type
 #endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
@@ -151,7 +153,7 @@
 };
 
 # endif /* _STLP_NO_EXTENSIONS */
-    
+
 _STLP_END_NAMESPACE
 
 # ifndef _STLP_LINK_TIME_INSTANTIATION