1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_numeric.c	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_numeric.c	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -10,13 +10,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 @@ -32,12 +32,13 @@
    1.20  
    1.21  _STLP_BEGIN_NAMESPACE
    1.22  
    1.23 +_STLP_MOVE_TO_PRIV_NAMESPACE
    1.24 +
    1.25  template <class _InputIterator, class _OutputIterator, class _Tp,
    1.26            class _BinaryOperation>
    1.27 -_OutputIterator 
    1.28 -__partial_sum(_InputIterator __first, _InputIterator __last, 
    1.29 -              _OutputIterator __result, _Tp*, _BinaryOperation __binary_op)
    1.30 -{
    1.31 +_OutputIterator
    1.32 +__partial_sum(_InputIterator __first, _InputIterator __last,
    1.33 +              _OutputIterator __result, _Tp*, _BinaryOperation __binary_op) {
    1.34    _STLP_DEBUG_CHECK(__check_range(__first, __last))
    1.35    if (__first == __last) return __result;
    1.36    *__result = *__first;
    1.37 @@ -50,10 +51,10 @@
    1.38    return ++__result;
    1.39  }
    1.40  
    1.41 -template <class _InputIterator, class _OutputIterator, class _Tp, 
    1.42 +template <class _InputIterator, class _OutputIterator, class _Tp,
    1.43            class _BinaryOperation>
    1.44  _OutputIterator
    1.45 -__adjacent_difference(_InputIterator __first, _InputIterator __last, 
    1.46 +__adjacent_difference(_InputIterator __first, _InputIterator __last,
    1.47                        _OutputIterator __result, _Tp*,
    1.48                        _BinaryOperation __binary_op) {
    1.49    _STLP_DEBUG_CHECK(__check_range(__first, __last))
    1.50 @@ -70,8 +71,7 @@
    1.51  
    1.52  
    1.53  template <class _Tp, class _Integer, class _MonoidOperation>
    1.54 -_Tp __power(_Tp __x, _Integer __n, _MonoidOperation __opr) 
    1.55 -{
    1.56 +_Tp __power(_Tp __x, _Integer __n, _MonoidOperation __opr) {
    1.57    _STLP_MPWFIX_TRY
    1.58    if (__n == 0)
    1.59      return __identity_element(__opr);
    1.60 @@ -81,7 +81,7 @@
    1.61        __x = __opr(__x, __x);
    1.62      }
    1.63      _Tp __result = __x;
    1.64 -	_STLP_MPWFIX_TRY
    1.65 +  _STLP_MPWFIX_TRY
    1.66      __n >>= 1;
    1.67      while (__n != 0) {
    1.68        __x = __opr(__x, __x);
    1.69 @@ -90,11 +90,13 @@
    1.70        __n >>= 1;
    1.71      }
    1.72      return __result;
    1.73 -	_STLP_MPWFIX_CATCH
    1.74 +  _STLP_MPWFIX_CATCH
    1.75    }
    1.76    _STLP_MPWFIX_CATCH_ACTION(__x = _Tp())
    1.77  }
    1.78  
    1.79 +_STLP_MOVE_TO_STD_NAMESPACE
    1.80 +
    1.81  _STLP_END_NAMESPACE
    1.82  
    1.83  #endif /*  _STLP_NUMERIC_C */