1.1 --- a/epoc32/include/stdapis/stlportv5/istream.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/istream.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,11 +1,11 @@
     1.4  /*
     1.5 - * Copyright (c) 1999 
     1.6 + * Copyright (c) 1999
     1.7   * Boris Fomitchev
     1.8   *
     1.9   * This material is provided "as is", with absolutely no warranty expressed
    1.10   * or implied. Any use is at your own risk.
    1.11   *
    1.12 - * Permission to use or copy this software for any purpose is hereby granted 
    1.13 + * Permission to use or copy this software for any purpose is hereby granted
    1.14   * without fee, provided the above notices are retained on all copies.
    1.15   * Permission to modify the code and to distribute modified code is granted,
    1.16   * provided the above notices are retained, and a notice that the code was
    1.17 @@ -14,50 +14,37 @@
    1.18   */
    1.19  
    1.20  #ifndef _STLP_ISTREAM_H
    1.21 -# define _STLP_ISTREAM_H
    1.22 +#define _STLP_ISTREAM_H
    1.23  
    1.24 -# ifndef _STLP_OUTERMOST_HEADER_ID
    1.25 +#ifndef _STLP_OUTERMOST_HEADER_ID
    1.26  #  define _STLP_OUTERMOST_HEADER_ID 0x2037
    1.27  #  include <stl/_prolog.h>
    1.28 -# endif
    1.29 +#endif
    1.30  
    1.31 -# if defined (_STLP_OWN_IOSTREAMS)
    1.32 +#include <stl/_ioserr.h>
    1.33  
    1.34 -# include <istream>
    1.35 +#include <istream>
    1.36  
    1.37 -# ifndef _STLP_HAS_NO_NAMESPACES
    1.38 +#ifndef _STLP_HAS_NO_NAMESPACES
    1.39  #  ifdef _STLP_BROKEN_USING_DIRECTIVE
    1.40 -using namespace _STLP_STD;
    1.41 +_STLP_USING_NAMESPACE(stlport)
    1.42  #  else
    1.43  using _STLP_STD::basic_istream;
    1.44  using _STLP_STD::basic_iostream;
    1.45  using _STLP_STD::istream;
    1.46  using _STLP_STD::iostream;
    1.47  using _STLP_STD::ios;
    1.48 -#   ifndef _STLP_NO_WCHAR_T
    1.49 +#    ifndef _STLP_NO_WCHAR_T
    1.50  using _STLP_STD::wistream;
    1.51  using _STLP_STD::wiostream;
    1.52 -#   endif
    1.53 +#    endif
    1.54  using _STLP_STD::ws;
    1.55  #  endif
    1.56 -# endif
    1.57 +#endif
    1.58  
    1.59 -# elif !defined (_STLP_USE_NO_IOSTREAMS)
    1.60 -
    1.61 -# include _STLP_NATIVE_OLD_STREAMS_HEADER(istream.h)
    1.62 -
    1.63 -# if defined (_STLP_USE_NAMESPACES) && !defined (_STLP_BROKEN_USING_DIRECTIVE)
    1.64 -_STLP_BEGIN_NAMESPACE
    1.65 -using _STLP_OLD_IO_NAMESPACE::istream;
    1.66 -_STLP_END_NAMESPACE
    1.67 -# endif /* _STLP_USE_OWN_NAMESPACE */
    1.68 -
    1.69 -# endif /* _STLP_OWN_IOSTREAMS */
    1.70 -
    1.71 -# if (_STLP_OUTERMOST_HEADER_ID == 0x2037)
    1.72 +#if (_STLP_OUTERMOST_HEADER_ID == 0x2037)
    1.73  #  include <stl/_epilog.h>
    1.74  #  undef _STLP_OUTERMOST_HEADER_ID
    1.75 -# endif
    1.76 +#endif
    1.77  
    1.78  #endif /* _STLP_ISTREAM_H */
    1.79 -