1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_heap.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_heap.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -30,31 +30,27 @@
     1.4  #ifndef _STLP_INTERNAL_HEAP_H
     1.5  #define _STLP_INTERNAL_HEAP_H
     1.6  
     1.7 -#ifndef _STLP_CONFIG_H
     1.8 -#include <stl/_config.h>
     1.9 -#endif
    1.10 -
    1.11  _STLP_BEGIN_NAMESPACE
    1.12  
    1.13  // Heap-manipulation functions: push_heap, pop_heap, make_heap, sort_heap.
    1.14  
    1.15  template <class _RandomAccessIterator>
    1.16 -void 
    1.17 +void
    1.18  push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last);
    1.19  
    1.20  
    1.21  template <class _RandomAccessIterator, class _Compare>
    1.22 -void 
    1.23 +void
    1.24  push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
    1.25            _Compare __comp);
    1.26  
    1.27  template <class _RandomAccessIterator, class _Distance, class _Tp>
    1.28 -void 
    1.29 +void
    1.30  __adjust_heap(_RandomAccessIterator __first, _Distance __holeIndex,
    1.31                _Distance __len, _Tp __val);
    1.32  
    1.33  template <class _RandomAccessIterator, class _Tp, class _Distance>
    1.34 -inline void 
    1.35 +inline void
    1.36  __pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
    1.37             _RandomAccessIterator __result, _Tp __val, _Distance*)
    1.38  {
    1.39 @@ -63,8 +59,8 @@
    1.40  }
    1.41  
    1.42  template <class _RandomAccessIterator>
    1.43 -void pop_heap(_RandomAccessIterator __first, 
    1.44 -	      _RandomAccessIterator __last);
    1.45 +void pop_heap(_RandomAccessIterator __first,
    1.46 +        _RandomAccessIterator __last);
    1.47  
    1.48  template <class _RandomAccessIterator, class _Distance,
    1.49            class _Tp, class _Compare>
    1.50 @@ -72,30 +68,30 @@
    1.51  __adjust_heap(_RandomAccessIterator __first, _Distance __holeIndex,
    1.52                _Distance __len, _Tp __val, _Compare __comp);
    1.53  
    1.54 -template <class _RandomAccessIterator, class _Tp, class _Compare, 
    1.55 +template <class _RandomAccessIterator, class _Tp, class _Compare,
    1.56            class _Distance>
    1.57 -inline void 
    1.58 +inline void
    1.59  __pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
    1.60             _RandomAccessIterator __result, _Tp __val, _Compare __comp,
    1.61             _Distance*)
    1.62  {
    1.63    *__result = *__first;
    1.64 -  __adjust_heap(__first, _Distance(0), _Distance(__last - __first), 
    1.65 +  __adjust_heap(__first, _Distance(0), _Distance(__last - __first),
    1.66                  __val, __comp);
    1.67  }
    1.68  
    1.69  template <class _RandomAccessIterator, class _Compare>
    1.70 -void 
    1.71 +void
    1.72  pop_heap(_RandomAccessIterator __first,
    1.73           _RandomAccessIterator __last, _Compare __comp);
    1.74  
    1.75  template <class _RandomAccessIterator>
    1.76 -void 
    1.77 +void
    1.78  make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last);
    1.79  
    1.80  template <class _RandomAccessIterator, class _Compare>
    1.81 -void 
    1.82 -make_heap(_RandomAccessIterator __first, 
    1.83 +void
    1.84 +make_heap(_RandomAccessIterator __first,
    1.85            _RandomAccessIterator __last, _Compare __comp);
    1.86  
    1.87  template <class _RandomAccessIterator>
    1.88 @@ -108,7 +104,7 @@
    1.89  
    1.90  template <class _RandomAccessIterator, class _Compare>
    1.91  _STLP_INLINE_LOOP
    1.92 -void 
    1.93 +void
    1.94  sort_heap(_RandomAccessIterator __first,
    1.95            _RandomAccessIterator __last, _Compare __comp)
    1.96  {