1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_function_adaptors.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_function_adaptors.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -9,7 +9,7 @@
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 * Copyright (c) 2000
1.12 @@ -21,7 +21,7 @@
1.13 * This material is provided "as is", with absolutely no warranty expressed
1.14 * or implied. Any use is at your own risk.
1.15 *
1.16 - * Permission to use or copy this software for any purpose is hereby granted
1.17 + * Permission to use or copy this software for any purpose is hereby granted
1.18 * without fee, provided the above notices are retained on all copies.
1.19 * Permission to modify the code and to distribute modified code is granted,
1.20 * provided the above notices are retained, and a notice that the code was
1.21 @@ -166,9 +166,9 @@
1.22 __fun_type _M_f;
1.23 };
1.24
1.25 -template<class _Result>
1.26 +template<class _Result>
1.27 struct _Mem_fun_traits {
1.28 - template<class _Tp>
1.29 + template<class _Tp>
1.30 struct _Args0 {
1.31 typedef _Mem_fun0_ptr<_Result,_Tp> _Ptr;
1.32 typedef _Const_mem_fun0_ptr<_Result,_Tp> _Ptr_const;
1.33 @@ -211,7 +211,7 @@
1.34 __fun_type _M_f;
1.35 };
1.36
1.37 -template<class _Result>
1.38 +template<class _Result>
1.39 struct _Ptr_fun_traits {
1.40 template<class _Arg> struct _Args1 {
1.41 typedef _Ptr_fun1_base<_Arg,_Result> _Fun;
1.42 @@ -376,7 +376,7 @@
1.43 template<class _Arg> struct _Args1 {
1.44 typedef _Ptr_void_fun1_base<_Arg> _Fun;
1.45 };
1.46 -
1.47 +
1.48 template<class _Arg1, class _Arg2> struct _Args2 {
1.49 typedef _Ptr_void_fun2_base<_Arg1,_Arg2> _Fun;
1.50 };
1.51 @@ -387,7 +387,7 @@
1.52 // arguments other than first
1.53
1.54 template<class _Result, class _Arg>
1.55 -class _Ptr_fun1 :
1.56 +class _Ptr_fun1 :
1.57 public _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Arg>::_Fun {
1.58 protected:
1.59 typedef typename _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Arg>::_Fun _Base;
1.60 @@ -395,7 +395,7 @@
1.61 };
1.62
1.63 template<class _Result, class _Arg1, class _Arg2>
1.64 -class _Ptr_fun2 :
1.65 +class _Ptr_fun2 :
1.66 public _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args2<_Arg1,_Arg2>::_Fun {
1.67 protected:
1.68 typedef typename _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args2<_Arg1,_Arg2>::_Fun _Base;
1.69 @@ -501,13 +501,13 @@
1.70 };
1.71
1.72 template <class _Arg1, class _Arg2, class _Result>
1.73 -class pointer_to_binary_function :
1.74 +class pointer_to_binary_function :
1.75 public binary_function<_Arg1,_Arg2,_Result> {
1.76 protected:
1.77 _Result (*_M_ptr)(_Arg1, _Arg2);
1.78 public:
1.79 pointer_to_binary_function() {}
1.80 - explicit pointer_to_binary_function(_Result (*__x)(_Arg1, _Arg2))
1.81 + explicit pointer_to_binary_function(_Result (*__x)(_Arg1, _Arg2))
1.82 : _M_ptr(__x) {}
1.83 _Result operator()(_Arg1 __x, _Arg2 __y) const {
1.84 return _M_ptr(__x, __y);
1.85 @@ -568,7 +568,7 @@
1.86 };
1.87
1.88 template <class _Tp, class _Arg>
1.89 -class const_mem_fun1_t<void, _Tp, _Arg>
1.90 +class const_mem_fun1_t<void, _Tp, _Arg>
1.91 : public binary_function<const _Tp*,_Arg,void> {
1.92 typedef void (_Tp::*__fun_type)(_Arg) const;
1.93 public:
1.94 @@ -601,7 +601,7 @@
1.95 };
1.96
1.97 template <class _Arg>
1.98 -class pointer_to_unary_function : public unary_function<_Arg, void> {
1.99 +class pointer_to_unary_function<_Arg, void> : public unary_function<_Arg, void> {
1.100 typedef void (*__fun_type)(_Arg);
1.101 __fun_type _M_ptr;
1.102 public:
1.103 @@ -611,7 +611,7 @@
1.104 };
1.105
1.106 template <class _Arg1, class _Arg2>
1.107 -class pointer_to_binary_function : public binary_function<_Arg1,_Arg2,void> {
1.108 +class pointer_to_binary_function<_Arg1, _Arg2, void> : public binary_function<_Arg1,_Arg2,void> {
1.109 typedef void (*__fun_type)(_Arg1, _Arg2);
1.110 __fun_type _M_ptr;
1.111 public:
1.112 @@ -626,7 +626,7 @@
1.113
1.114 //mem_fun_t
1.115 template <class _Result, class _Tp>
1.116 -class mem_fun_t :
1.117 +class mem_fun_t :
1.118 public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr {
1.119 typedef typename
1.120 _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr _Base;
1.121 @@ -636,7 +636,7 @@
1.122
1.123 //const_mem_fun_t
1.124 template <class _Result, class _Tp>
1.125 -class const_mem_fun_t :
1.126 +class const_mem_fun_t :
1.127 public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr_const {
1.128 typedef typename
1.129 _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr_const _Base;
1.130 @@ -708,7 +708,7 @@
1.131 template <class _Arg, class _Result>
1.132 class pointer_to_unary_function :
1.133 public _Ptr_fun1<_Result,_Arg> {
1.134 - typedef typename
1.135 + typedef typename
1.136 _Ptr_fun1<_Result,_Arg>::__fun_type __fun_type;
1.137 public:
1.138 explicit pointer_to_unary_function(__fun_type __f)
1.139 @@ -730,36 +730,36 @@
1.140
1.141 # if !defined (_STLP_MEMBER_POINTER_PARAM_BUG)
1.142 // Mem_fun adaptor helper functions. There are only two:
1.143 -// mem_fun and mem_fun_ref. (mem_fun1 and mem_fun1_ref
1.144 +// mem_fun and mem_fun_ref. (mem_fun1 and mem_fun1_ref
1.145 // are provided for backward compatibility, but they are no longer
1.146 // part of the C++ standard.)
1.147
1.148 template <class _Result, class _Tp>
1.149 -inline mem_fun_t<_Result,_Tp>
1.150 +inline mem_fun_t<_Result,_Tp>
1.151 mem_fun(_Result (_Tp::*__f)()) { return mem_fun_t<_Result,_Tp>(__f); }
1.152
1.153 template <class _Result, class _Tp>
1.154 -inline const_mem_fun_t<_Result,_Tp>
1.155 +inline const_mem_fun_t<_Result,_Tp>
1.156 mem_fun(_Result (_Tp::*__f)() const) { return const_mem_fun_t<_Result,_Tp>(__f); }
1.157
1.158 template <class _Result, class _Tp>
1.159 -inline mem_fun_ref_t<_Result,_Tp>
1.160 +inline mem_fun_ref_t<_Result,_Tp>
1.161 mem_fun_ref(_Result (_Tp::*__f)()) { return mem_fun_ref_t<_Result,_Tp>(__f); }
1.162
1.163 template <class _Result, class _Tp>
1.164 -inline const_mem_fun_ref_t<_Result,_Tp>
1.165 +inline const_mem_fun_ref_t<_Result,_Tp>
1.166 mem_fun_ref(_Result (_Tp::*__f)() const) { return const_mem_fun_ref_t<_Result,_Tp>(__f); }
1.167
1.168 template <class _Result, class _Tp, class _Arg>
1.169 -inline mem_fun1_t<_Result,_Tp,_Arg>
1.170 +inline mem_fun1_t<_Result,_Tp,_Arg>
1.171 mem_fun(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_t<_Result,_Tp,_Arg>(__f); }
1.172
1.173 template <class _Result, class _Tp, class _Arg>
1.174 -inline const_mem_fun1_t<_Result,_Tp,_Arg>
1.175 +inline const_mem_fun1_t<_Result,_Tp,_Arg>
1.176 mem_fun(_Result (_Tp::*__f)(_Arg) const) { return const_mem_fun1_t<_Result,_Tp,_Arg>(__f); }
1.177
1.178 template <class _Result, class _Tp, class _Arg>
1.179 -inline mem_fun1_ref_t<_Result,_Tp,_Arg>
1.180 +inline mem_fun1_ref_t<_Result,_Tp,_Arg>
1.181 mem_fun_ref(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_ref_t<_Result,_Tp,_Arg>(__f); }
1.182
1.183 template <class _Result, class _Tp, class _Arg>
1.184 @@ -770,15 +770,15 @@
1.185 // mem_fun1 and mem_fun1_ref are no longer part of the C++ standard,
1.186 // but they are provided for backward compatibility.
1.187 template <class _Result, class _Tp, class _Arg>
1.188 -inline mem_fun1_t<_Result,_Tp,_Arg>
1.189 +inline mem_fun1_t<_Result,_Tp,_Arg>
1.190 mem_fun1(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_t<_Result,_Tp,_Arg>(__f); }
1.191
1.192 template <class _Result, class _Tp, class _Arg>
1.193 -inline const_mem_fun1_t<_Result,_Tp,_Arg>
1.194 +inline const_mem_fun1_t<_Result,_Tp,_Arg>
1.195 mem_fun1(_Result (_Tp::*__f)(_Arg) const) { return const_mem_fun1_t<_Result,_Tp,_Arg>(__f); }
1.196
1.197 template <class _Result, class _Tp, class _Arg>
1.198 -inline mem_fun1_ref_t<_Result,_Tp,_Arg>
1.199 +inline mem_fun1_ref_t<_Result,_Tp,_Arg>
1.200 mem_fun1_ref(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_ref_t<_Result,_Tp,_Arg>(__f); }
1.201
1.202 template <class _Result, class _Tp, class _Arg>
1.203 @@ -791,12 +791,12 @@
1.204
1.205 template <class _Arg, class _Result>
1.206 inline pointer_to_unary_function<_Arg, _Result>
1.207 -ptr_fun(_Result (*__f)(_Arg))
1.208 +ptr_fun(_Result (*__f)(_Arg))
1.209 { return pointer_to_unary_function<_Arg, _Result>(__f); }
1.210
1.211 template <class _Arg1, class _Arg2, class _Result>
1.212 -inline pointer_to_binary_function<_Arg1,_Arg2,_Result>
1.213 -ptr_fun(_Result (*__f)(_Arg1, _Arg2))
1.214 +inline pointer_to_binary_function<_Arg1,_Arg2,_Result>
1.215 +ptr_fun(_Result (*__f)(_Arg1, _Arg2))
1.216 { return pointer_to_binary_function<_Arg1,_Arg2,_Result>(__f); }
1.217
1.218 _STLP_END_NAMESPACE