diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/istream.h
--- a/epoc32/include/stdapis/stlportv5/istream.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/stdapis/stlportv5/istream.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,11 +1,11 @@
 /*
- * 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
@@ -14,50 +14,37 @@
  */
 
 #ifndef _STLP_ISTREAM_H
-# define _STLP_ISTREAM_H
+#define _STLP_ISTREAM_H
 
-# ifndef _STLP_OUTERMOST_HEADER_ID
+#ifndef _STLP_OUTERMOST_HEADER_ID
 #  define _STLP_OUTERMOST_HEADER_ID 0x2037
 #  include <stl/_prolog.h>
-# endif
+#endif
 
-# if defined (_STLP_OWN_IOSTREAMS)
+#include <stl/_ioserr.h>
 
-# include <istream>
+#include <istream>
 
-# ifndef _STLP_HAS_NO_NAMESPACES
+#ifndef _STLP_HAS_NO_NAMESPACES
 #  ifdef _STLP_BROKEN_USING_DIRECTIVE
-using namespace _STLP_STD;
+_STLP_USING_NAMESPACE(stlport)
 #  else
 using _STLP_STD::basic_istream;
 using _STLP_STD::basic_iostream;
 using _STLP_STD::istream;
 using _STLP_STD::iostream;
 using _STLP_STD::ios;
-#   ifndef _STLP_NO_WCHAR_T
+#    ifndef _STLP_NO_WCHAR_T
 using _STLP_STD::wistream;
 using _STLP_STD::wiostream;
-#   endif
+#    endif
 using _STLP_STD::ws;
 #  endif
-# endif
+#endif
 
-# elif !defined (_STLP_USE_NO_IOSTREAMS)
-
-# include _STLP_NATIVE_OLD_STREAMS_HEADER(istream.h)
-
-# if defined (_STLP_USE_NAMESPACES) && !defined (_STLP_BROKEN_USING_DIRECTIVE)
-_STLP_BEGIN_NAMESPACE
-using _STLP_OLD_IO_NAMESPACE::istream;
-_STLP_END_NAMESPACE
-# endif /* _STLP_USE_OWN_NAMESPACE */
-
-# endif /* _STLP_OWN_IOSTREAMS */
-
-# if (_STLP_OUTERMOST_HEADER_ID == 0x2037)
+#if (_STLP_OUTERMOST_HEADER_ID == 0x2037)
 #  include <stl/_epilog.h>
 #  undef _STLP_OUTERMOST_HEADER_ID
-# endif
+#endif
 
 #endif /* _STLP_ISTREAM_H */
-