1.1 --- a/epoc32/include/stdapis/stlportv5/algorithm	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/algorithm	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -9,13 +9,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 @@ -26,32 +26,32 @@
    1.20  #ifndef _STLP_ALGORITHM
    1.21  #define _STLP_ALGORITHM
    1.22  
    1.23 -# ifndef _STLP_OUTERMOST_HEADER_ID
    1.24 +#ifndef _STLP_OUTERMOST_HEADER_ID
    1.25  #  define _STLP_OUTERMOST_HEADER_ID 0x1
    1.26  #  include <stl/_prolog.h>
    1.27 -# endif
    1.28 +#endif
    1.29  
    1.30  #ifdef _STLP_PRAGMA_ONCE
    1.31 -# pragma once
    1.32 +#  pragma once
    1.33  #endif
    1.34  
    1.35 -# if ! defined (_STLP_USE_NAMESPACES)
    1.36 +#ifndef _STLP_INTERNAL_CSTDIO
    1.37  // remove() conflicts, <cstdio> should always go first
    1.38 -#  include <cstdio>
    1.39 -# endif
    1.40 +#  include <stl/_cstdio.h>
    1.41 +#endif
    1.42  
    1.43 -# ifndef _STLP_INTERNAL_ALGO_H
    1.44 +#ifndef _STLP_INTERNAL_ALGO_H
    1.45  #  include <stl/_algo.h>
    1.46 -# endif
    1.47 +#endif
    1.48  
    1.49  #if defined (_STLP_IMPORT_VENDOR_STD)
    1.50 -# include _STLP_NATIVE_HEADER(algorithm)
    1.51 +#  include _STLP_NATIVE_HEADER(algorithm)
    1.52  #endif /* _STLP_IMPORT_VENDOR_STD */
    1.53  
    1.54 -# if (_STLP_OUTERMOST_HEADER_ID == 0x1 )
    1.55 +#if (_STLP_OUTERMOST_HEADER_ID == 0x1 )
    1.56  #  include <stl/_epilog.h>
    1.57  #  undef _STLP_OUTERMOST_HEADER_ID
    1.58 -# endif
    1.59 +#endif
    1.60  
    1.61  #endif /* _STLP_ALGORITHM */
    1.62