diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_numeric.c --- a/epoc32/include/stdapis/stlportv5/stl/_numeric.c Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/stdapis/stlportv5/stl/_numeric.c Wed Mar 31 12:33:34 2010 +0100 @@ -10,13 +10,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 @@ -32,12 +32,13 @@ _STLP_BEGIN_NAMESPACE +_STLP_MOVE_TO_PRIV_NAMESPACE + template -_OutputIterator -__partial_sum(_InputIterator __first, _InputIterator __last, - _OutputIterator __result, _Tp*, _BinaryOperation __binary_op) -{ +_OutputIterator +__partial_sum(_InputIterator __first, _InputIterator __last, + _OutputIterator __result, _Tp*, _BinaryOperation __binary_op) { _STLP_DEBUG_CHECK(__check_range(__first, __last)) if (__first == __last) return __result; *__result = *__first; @@ -50,10 +51,10 @@ return ++__result; } -template _OutputIterator -__adjacent_difference(_InputIterator __first, _InputIterator __last, +__adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Tp*, _BinaryOperation __binary_op) { _STLP_DEBUG_CHECK(__check_range(__first, __last)) @@ -70,8 +71,7 @@ template -_Tp __power(_Tp __x, _Integer __n, _MonoidOperation __opr) -{ +_Tp __power(_Tp __x, _Integer __n, _MonoidOperation __opr) { _STLP_MPWFIX_TRY if (__n == 0) return __identity_element(__opr); @@ -81,7 +81,7 @@ __x = __opr(__x, __x); } _Tp __result = __x; - _STLP_MPWFIX_TRY + _STLP_MPWFIX_TRY __n >>= 1; while (__n != 0) { __x = __opr(__x, __x); @@ -90,11 +90,13 @@ __n >>= 1; } return __result; - _STLP_MPWFIX_CATCH + _STLP_MPWFIX_CATCH } _STLP_MPWFIX_CATCH_ACTION(__x = _Tp()) } +_STLP_MOVE_TO_STD_NAMESPACE + _STLP_END_NAMESPACE #endif /* _STLP_NUMERIC_C */