diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_numeric.h
--- a/epoc32/include/stdapis/stlportv5/stl/_numeric.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/stdapis/stlportv5/stl/_numeric.h	Wed Mar 31 12:33:34 2010 +0100
@@ -6,13 +6,13 @@
  * Copyright (c) 1996,1997
  * Silicon Graphics Computer Systems, Inc.
  *
- * 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
@@ -24,40 +24,33 @@
  *   You should not attempt to use it directly.
  */
 
-
 #ifndef _STLP_INTERNAL_NUMERIC_H
 #define _STLP_INTERNAL_NUMERIC_H
 
-#ifndef _STLP_INTERNAL_FUNCTION_H
+#ifndef _STLP_INTERNAL_FUNCTION_BASE_H
 # include <stl/_function_base.h>
 #endif
 
 #ifndef _STLP_INTERNAL_ITERATOR_BASE_H
-# include <stl/_iterator_base.h>
+#  include <stl/_iterator_base.h>
 #endif
 
 _STLP_BEGIN_NAMESPACE
 
 template <class _InputIterator, class _Tp>
 _STLP_INLINE_LOOP
-_Tp accumulate(_InputIterator __first, _InputIterator __last, _Tp _Init)
-{
-  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+_Tp accumulate(_InputIterator __first, _InputIterator __last, _Tp _Init) {
+  _STLP_DEBUG_CHECK(_STLP_PRIV __check_range(__first, __last))
   for ( ; __first != __last; ++__first)
-#ifndef 	__SYMBIAN32__  	
     _Init = _Init + *__first;
-#else
-	    _Init +=  *__first;
-#endif
   return _Init;
 }
 
 template <class _InputIterator, class _Tp, class _BinaryOperation>
 _STLP_INLINE_LOOP
 _Tp accumulate(_InputIterator __first, _InputIterator __last, _Tp _Init,
-               _BinaryOperation __binary_op)
-{
-  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+               _BinaryOperation __binary_op) {
+  _STLP_DEBUG_CHECK(_STLP_PRIV __check_range(__first, __last))
   for ( ; __first != __last; ++__first)
     _Init = __binary_op(_Init, *__first);
   return _Init;
@@ -66,9 +59,8 @@
 template <class _InputIterator1, class _InputIterator2, class _Tp>
 _STLP_INLINE_LOOP
 _Tp inner_product(_InputIterator1 __first1, _InputIterator1 __last1,
-                  _InputIterator2 __first2, _Tp _Init)
-{
-  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+                  _InputIterator2 __first2, _Tp _Init) {
+  _STLP_DEBUG_CHECK(_STLP_PRIV __check_range(__first1, __last1))
   for ( ; __first1 != __last1; ++__first1, ++__first2)
     _Init = _Init + (*__first1 * *__first2);
   return _Init;
@@ -78,110 +70,119 @@
           class _BinaryOperation1, class _BinaryOperation2>
 _STLP_INLINE_LOOP
 _Tp inner_product(_InputIterator1 __first1, _InputIterator1 __last1,
-                  _InputIterator2 __first2, _Tp _Init, 
+                  _InputIterator2 __first2, _Tp _Init,
                   _BinaryOperation1 __binary_op1,
-                  _BinaryOperation2 __binary_op2)
-{
-  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+                  _BinaryOperation2 __binary_op2) {
+  _STLP_DEBUG_CHECK(_STLP_PRIV __check_range(__first1, __last1))
   for ( ; __first1 != __last1; ++__first1, ++__first2)
     _Init = __binary_op1(_Init, __binary_op2(*__first1, *__first2));
   return _Init;
 }
 
+_STLP_MOVE_TO_PRIV_NAMESPACE
+
 template <class _InputIterator, class _OutputIterator, class _Tp,
           class _BinaryOperation>
-_OutputIterator 
-__partial_sum(_InputIterator __first, _InputIterator __last, 
+_OutputIterator
+__partial_sum(_InputIterator __first, _InputIterator __last,
               _OutputIterator __result, _Tp*, _BinaryOperation __binary_op);
 
+_STLP_MOVE_TO_STD_NAMESPACE
 
 template <class _InputIterator, class _OutputIterator>
-inline _OutputIterator 
+inline _OutputIterator
 partial_sum(_InputIterator __first, _InputIterator __last,
             _OutputIterator __result) {
-  return __partial_sum(__first, __last, __result, _STLP_VALUE_TYPE(__first, _InputIterator),
-                       __plus(_STLP_VALUE_TYPE(__first, _InputIterator)));
+  return _STLP_PRIV __partial_sum(__first, __last, __result, _STLP_VALUE_TYPE(__first, _InputIterator),
+                                  _STLP_PRIV __plus(_STLP_VALUE_TYPE(__first, _InputIterator)));
 }
 
 template <class _InputIterator, class _OutputIterator, class _BinaryOperation>
-inline _OutputIterator 
+inline _OutputIterator
 partial_sum(_InputIterator __first, _InputIterator __last,
             _OutputIterator __result, _BinaryOperation __binary_op) {
-  return __partial_sum(__first, __last, __result, _STLP_VALUE_TYPE(__first, _InputIterator), 
-                       __binary_op);
+  return _STLP_PRIV __partial_sum(__first, __last, __result, _STLP_VALUE_TYPE(__first, _InputIterator),
+                                  __binary_op);
 }
 
+_STLP_MOVE_TO_PRIV_NAMESPACE
 
-template <class _InputIterator, class _OutputIterator, class _Tp, 
+template <class _InputIterator, class _OutputIterator, class _Tp,
           class _BinaryOperation>
 _OutputIterator
-__adjacent_difference(_InputIterator __first, _InputIterator __last, 
+__adjacent_difference(_InputIterator __first, _InputIterator __last,
                       _OutputIterator __result, _Tp*,
                       _BinaryOperation __binary_op);
 
+_STLP_MOVE_TO_STD_NAMESPACE
+
 template <class _InputIterator, class _OutputIterator>
 inline _OutputIterator
 adjacent_difference(_InputIterator __first,
                     _InputIterator __last, _OutputIterator __result) {
-  return __adjacent_difference(__first, __last, __result,
-                               _STLP_VALUE_TYPE(__first, _InputIterator),
-                               __minus(_STLP_VALUE_TYPE(__first, _InputIterator)));
+  return _STLP_PRIV __adjacent_difference(__first, __last, __result,
+                                          _STLP_VALUE_TYPE(__first, _InputIterator),
+                                          _STLP_PRIV __minus(_STLP_VALUE_TYPE(__first, _InputIterator)));
 }
 
 template <class _InputIterator, class _OutputIterator, class _BinaryOperation>
-_OutputIterator 
+_OutputIterator
 adjacent_difference(_InputIterator __first, _InputIterator __last,
                     _OutputIterator __result, _BinaryOperation __binary_op) {
-  return __adjacent_difference(__first, __last, __result,
-                               _STLP_VALUE_TYPE(__first, _InputIterator),
-                               __binary_op);
+  return _STLP_PRIV __adjacent_difference(__first, __last, __result,
+                                          _STLP_VALUE_TYPE(__first, _InputIterator),
+                                          __binary_op);
 }
 
+_STLP_MOVE_TO_PRIV_NAMESPACE
+
 template <class _Tp, class _Integer, class _MonoidOperation>
 _Tp __power(_Tp __x, _Integer __n, _MonoidOperation __opr);
 
-# ifndef _STLP_NO_EXTENSIONS
+_STLP_MOVE_TO_STD_NAMESPACE
+
+#if !defined (_STLP_NO_EXTENSIONS)
 
 // Returns __x ** __n, where __n >= 0.  _Note that "multiplication"
 // is required to be associative, but not necessarily commutative.
 
+_STLP_MOVE_TO_PRIV_NAMESPACE
+
 template <class _Tp, class _Integer>
-inline _Tp __power(_Tp __x, _Integer __n)
-{
+inline _Tp __power(_Tp __x, _Integer __n) {
   return __power(__x, __n, multiplies<_Tp>());
 }
 
+_STLP_MOVE_TO_STD_NAMESPACE
+
 // Alias for the internal name __power.  Note that power is an extension,
 // not part of the C++ standard.
 template <class _Tp, class _Integer, class _MonoidOperation>
 inline _Tp power(_Tp __x, _Integer __n, _MonoidOperation __opr) {
-  return __power(__x, __n, __opr);
+  return _STLP_PRIV __power(__x, __n, __opr);
 }
 
-
 template <class _Tp, class _Integer>
 inline _Tp power(_Tp __x, _Integer __n) {
-  return __power(__x, __n, multiplies<_Tp>());
+  return _STLP_PRIV __power(__x, __n, multiplies<_Tp>());
 }
 
 // iota is not part of the C++ standard.  It is an extension.
 
 template <class _ForwardIterator, class _Tp>
 _STLP_INLINE_LOOP
-void 
-iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __val)
-{
-  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+void iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __val) {
+  _STLP_DEBUG_CHECK(_STLP_PRIV __check_range(__first, __last))
   while (__first != __last)
     *__first++ = __val++;
 }
-# endif
+#endif
 
 _STLP_END_NAMESPACE
 
-# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#if !defined (_STLP_LINK_TIME_INSTANTIATION)
 #  include <stl/_numeric.c>
-# endif
+#endif
 
 #endif /* _STLP_INTERNAL_NUMERIC_H */