1.1 --- a/epoc32/include/stdapis/stlportv5/string	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/string	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -2,13 +2,13 @@
     1.4   * Copyright (c) 1997-1999
     1.5   * Silicon Graphics Computer Systems, Inc.
     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 @@ -19,40 +19,29 @@
    1.20  #ifndef _STLP_STRING
    1.21  # define _STLP_STRING
    1.22  
    1.23 -# ifndef _STLP_OUTERMOST_HEADER_ID
    1.24 +#ifndef _STLP_OUTERMOST_HEADER_ID
    1.25  #  define _STLP_OUTERMOST_HEADER_ID 0x68
    1.26  #  include <stl/_prolog.h>
    1.27 -# endif
    1.28 +#endif
    1.29  
    1.30 -# ifdef _STLP_PRAGMA_ONCE
    1.31 +#ifdef _STLP_PRAGMA_ONCE
    1.32  #  pragma once
    1.33 -# endif
    1.34 +#endif
    1.35  
    1.36 -#if defined (_STLP_USE_NATIVE_STRING)
    1.37 +#if defined (_STLP_USE_OWN_NAMESPACE)
    1.38 +#  include <stl/_string.h>
    1.39 +#endif
    1.40  
    1.41 -// as part of compiled runtime library depends on it.
    1.42 +#include <stl/_string_hash.h>
    1.43  
    1.44 -# if defined (_STLP_MSVC)
    1.45 -#  include <streambuf>
    1.46 -#  include <istream>
    1.47 -# endif
    1.48 +#if !defined (_STLP_USE_NO_IOSTREAMS)
    1.49 +#  include <stl/_string_io.h>
    1.50 +#endif
    1.51  
    1.52 -#  include _STLP_NATIVE_HEADER(string)
    1.53 -
    1.54 -# endif /* _STLP_USE_NATIVE_STRING */
    1.55 -
    1.56 -# if !defined (_STLP_USE_NATIVE_STRING) || defined (_STLP_USE_OWN_NAMESPACE)
    1.57 -# include <stl/_string.h>
    1.58 -# else
    1.59 -# include <stl/_string_hash.h>
    1.60 -# endif /*_STLP_USE_NATIVE_STRING */
    1.61 -
    1.62 -// cleanup
    1.63 -
    1.64 -# if (_STLP_OUTERMOST_HEADER_ID == 0x68)
    1.65 +#if (_STLP_OUTERMOST_HEADER_ID == 0x68)
    1.66  #  include <stl/_epilog.h>
    1.67  #  undef _STLP_OUTERMOST_HEADER_ID
    1.68 -# endif
    1.69 +#endif
    1.70  
    1.71  #endif /* _STLP_STRING */
    1.72