diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_function_adaptors.h
--- a/epoc32/include/stdapis/stlportv5/stl/_function_adaptors.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/stdapis/stlportv5/stl/_function_adaptors.h	Wed Mar 31 12:33:34 2010 +0100
@@ -9,7 +9,7 @@
  * Copyright (c) 1997
  * Moscow Center for SPARC Technology
  *
- * Copyright (c) 1999 
+ * Copyright (c) 1999
  * Boris Fomitchev
  *
  * Copyright (c) 2000
@@ -21,7 +21,7 @@
  * 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
@@ -166,9 +166,9 @@
   __fun_type _M_f;
 };
 
-template<class _Result> 
+template<class _Result>
 struct _Mem_fun_traits {
-  template<class _Tp> 
+  template<class _Tp>
   struct _Args0 {
     typedef _Mem_fun0_ptr<_Result,_Tp>            _Ptr;
     typedef _Const_mem_fun0_ptr<_Result,_Tp>      _Ptr_const;
@@ -211,7 +211,7 @@
   __fun_type _M_f;
 };
 
-template<class _Result> 
+template<class _Result>
 struct _Ptr_fun_traits {
   template<class _Arg> struct _Args1 {
     typedef _Ptr_fun1_base<_Arg,_Result> _Fun;
@@ -376,7 +376,7 @@
   template<class _Arg> struct _Args1 {
     typedef _Ptr_void_fun1_base<_Arg> _Fun;
   };
-  
+
   template<class _Arg1, class _Arg2> struct _Args2 {
     typedef _Ptr_void_fun2_base<_Arg1,_Arg2> _Fun;
   };
@@ -387,7 +387,7 @@
 // arguments other than first
 
 template<class _Result, class _Arg>
-class _Ptr_fun1 : 
+class _Ptr_fun1 :
   public _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Arg>::_Fun {
 protected:
   typedef typename _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Arg>::_Fun _Base;
@@ -395,7 +395,7 @@
 };
 
 template<class _Result, class _Arg1, class _Arg2>
-class _Ptr_fun2 : 
+class _Ptr_fun2 :
   public _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args2<_Arg1,_Arg2>::_Fun {
 protected:
   typedef typename _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args2<_Arg1,_Arg2>::_Fun _Base;
@@ -501,13 +501,13 @@
 };
 
 template <class _Arg1, class _Arg2, class _Result>
-class pointer_to_binary_function : 
+class pointer_to_binary_function :
   public binary_function<_Arg1,_Arg2,_Result> {
 protected:
     _Result (*_M_ptr)(_Arg1, _Arg2);
 public:
     pointer_to_binary_function() {}
-    explicit pointer_to_binary_function(_Result (*__x)(_Arg1, _Arg2)) 
+    explicit pointer_to_binary_function(_Result (*__x)(_Arg1, _Arg2))
       : _M_ptr(__x) {}
     _Result operator()(_Arg1 __x, _Arg2 __y) const {
       return _M_ptr(__x, __y);
@@ -568,7 +568,7 @@
 };
 
 template <class _Tp, class _Arg>
-class const_mem_fun1_t<void, _Tp, _Arg> 
+class const_mem_fun1_t<void, _Tp, _Arg>
   : public binary_function<const _Tp*,_Arg,void> {
   typedef void (_Tp::*__fun_type)(_Arg) const;
 public:
@@ -601,7 +601,7 @@
 };
 
 template <class _Arg>
-class pointer_to_unary_function : public unary_function<_Arg, void> {
+class pointer_to_unary_function<_Arg, void> : public unary_function<_Arg, void> {
   typedef void (*__fun_type)(_Arg);
   __fun_type _M_ptr;
 public:
@@ -611,7 +611,7 @@
 };
 
 template <class _Arg1, class _Arg2>
-class pointer_to_binary_function : public binary_function<_Arg1,_Arg2,void> {
+class pointer_to_binary_function<_Arg1, _Arg2, void> : public binary_function<_Arg1,_Arg2,void> {
   typedef void (*__fun_type)(_Arg1, _Arg2);
   __fun_type _M_ptr;
 public:
@@ -626,7 +626,7 @@
 
 //mem_fun_t
 template <class _Result, class _Tp>
-class mem_fun_t : 
+class mem_fun_t :
   public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr {
   typedef typename
     _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr _Base;
@@ -636,7 +636,7 @@
 
 //const_mem_fun_t
 template <class _Result, class _Tp>
-class const_mem_fun_t : 
+class const_mem_fun_t :
   public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr_const {
   typedef typename
     _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr_const _Base;
@@ -708,7 +708,7 @@
 template <class _Arg, class _Result>
 class pointer_to_unary_function :
 public _Ptr_fun1<_Result,_Arg> {
-  typedef typename 
+  typedef typename
     _Ptr_fun1<_Result,_Arg>::__fun_type __fun_type;
 public:
   explicit pointer_to_unary_function(__fun_type __f)
@@ -730,36 +730,36 @@
 
 # if !defined (_STLP_MEMBER_POINTER_PARAM_BUG)
 // Mem_fun adaptor helper functions.  There are only two:
-//  mem_fun and mem_fun_ref.  (mem_fun1 and mem_fun1_ref 
+//  mem_fun and mem_fun_ref.  (mem_fun1 and mem_fun1_ref
 //  are provided for backward compatibility, but they are no longer
 //  part of the C++ standard.)
 
 template <class _Result, class _Tp>
-inline mem_fun_t<_Result,_Tp> 
+inline mem_fun_t<_Result,_Tp>
 mem_fun(_Result (_Tp::*__f)()) { return mem_fun_t<_Result,_Tp>(__f); }
 
 template <class _Result, class _Tp>
-inline const_mem_fun_t<_Result,_Tp> 
+inline const_mem_fun_t<_Result,_Tp>
 mem_fun(_Result (_Tp::*__f)() const)  { return const_mem_fun_t<_Result,_Tp>(__f); }
 
 template <class _Result, class _Tp>
-inline mem_fun_ref_t<_Result,_Tp> 
+inline mem_fun_ref_t<_Result,_Tp>
 mem_fun_ref(_Result (_Tp::*__f)())  { return mem_fun_ref_t<_Result,_Tp>(__f); }
 
 template <class _Result, class _Tp>
-inline const_mem_fun_ref_t<_Result,_Tp> 
+inline const_mem_fun_ref_t<_Result,_Tp>
 mem_fun_ref(_Result (_Tp::*__f)() const)  { return const_mem_fun_ref_t<_Result,_Tp>(__f); }
 
 template <class _Result, class _Tp, class _Arg>
-inline mem_fun1_t<_Result,_Tp,_Arg> 
+inline mem_fun1_t<_Result,_Tp,_Arg>
 mem_fun(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_t<_Result,_Tp,_Arg>(__f); }
 
 template <class _Result, class _Tp, class _Arg>
-inline const_mem_fun1_t<_Result,_Tp,_Arg> 
+inline const_mem_fun1_t<_Result,_Tp,_Arg>
 mem_fun(_Result (_Tp::*__f)(_Arg) const) { return const_mem_fun1_t<_Result,_Tp,_Arg>(__f); }
 
 template <class _Result, class _Tp, class _Arg>
-inline mem_fun1_ref_t<_Result,_Tp,_Arg> 
+inline mem_fun1_ref_t<_Result,_Tp,_Arg>
 mem_fun_ref(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_ref_t<_Result,_Tp,_Arg>(__f); }
 
 template <class _Result, class _Tp, class _Arg>
@@ -770,15 +770,15 @@
 //  mem_fun1 and mem_fun1_ref are no longer part of the C++ standard,
 //  but they are provided for backward compatibility.
 template <class _Result, class _Tp, class _Arg>
-inline mem_fun1_t<_Result,_Tp,_Arg> 
+inline mem_fun1_t<_Result,_Tp,_Arg>
 mem_fun1(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_t<_Result,_Tp,_Arg>(__f); }
 
 template <class _Result, class _Tp, class _Arg>
-inline const_mem_fun1_t<_Result,_Tp,_Arg> 
+inline const_mem_fun1_t<_Result,_Tp,_Arg>
 mem_fun1(_Result (_Tp::*__f)(_Arg) const) { return const_mem_fun1_t<_Result,_Tp,_Arg>(__f); }
 
 template <class _Result, class _Tp, class _Arg>
-inline mem_fun1_ref_t<_Result,_Tp,_Arg> 
+inline mem_fun1_ref_t<_Result,_Tp,_Arg>
 mem_fun1_ref(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_ref_t<_Result,_Tp,_Arg>(__f); }
 
 template <class _Result, class _Tp, class _Arg>
@@ -791,12 +791,12 @@
 
 template <class _Arg, class _Result>
 inline pointer_to_unary_function<_Arg, _Result>
-ptr_fun(_Result (*__f)(_Arg)) 
+ptr_fun(_Result (*__f)(_Arg))
 { return pointer_to_unary_function<_Arg, _Result>(__f); }
 
 template <class _Arg1, class _Arg2, class _Result>
-inline pointer_to_binary_function<_Arg1,_Arg2,_Result> 
-ptr_fun(_Result (*__f)(_Arg1, _Arg2)) 
+inline pointer_to_binary_function<_Arg1,_Arg2,_Result>
+ptr_fun(_Result (*__f)(_Arg1, _Arg2))
 { return pointer_to_binary_function<_Arg1,_Arg2,_Result>(__f); }
 
 _STLP_END_NAMESPACE