diff -r 666f914201fb -r 2fe1408b6811 epoc32/include/stdapis/stlport/iostream
--- a/epoc32/include/stdapis/stlport/iostream	Tue Nov 24 13:55:44 2009 +0000
+++ b/epoc32/include/stdapis/stlport/iostream	Tue Mar 16 16:12:26 2010 +0000
@@ -1,1 +1,130 @@
-iostream
+/*
+ * © Portions copyright (c) 2006-2007 Nokia Corporation.  All rights reserved.
+ *
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * 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 
+ * 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
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+#ifndef _STLP_IOSTREAM
+#define _STLP_IOSTREAM
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1037
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+
+#include <stl/_iosfwd.h>
+#include <stl/_istream.h>
+
+_STLP_BEGIN_NAMESPACE
+
+#ifndef _STLP_USE_NAMESPACES
+// in case of SGI iostreams, we have to rename our streams not to clash with those
+// provided in native lib
+# define cin _STLP_cin
+# define cout _STLP_cout
+# define cerr _STLP_cerr
+# define clog _STLP_clog
+#endif
+
+// Note: cin and wcin are both associated with stdio.  The C standard
+// (Amendment 1, section 4.6.2.1) says that it is an error to mix
+// wide- and narrow-oriented I/O on the same stream.  This implies
+// that it is an error to use both cin and wcin in the same C++
+// program; the same applies to cout and wcout, and cerr/clog and
+// wcerr/wclog.
+#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
+_STLP_DECLSPEC ostream& GetCErrStream();
+_STLP_DECLSPEC ostream& GetCoutStream();
+_STLP_DECLSPEC ostream& GetClogStream();
+_STLP_DECLSPEC istream& GetCinStream(); 
+
+//#define std::cerr (std::GetCErrStream())
+#define cerr GetCErrStream()
+//#define std::cin (std::GetCinStream())
+#define cin GetCinStream()
+//#define std::cout (std::GetCoutStream())
+#define cout GetCoutStream()
+//#define std::clog (std::GetClogStream())
+#define clog GetClogStream()
+#else //__LIBSTD_CPP_SYMBIAN32_WSD__
+extern _STLP_DECLSPEC istream cin;
+extern _STLP_DECLSPEC ostream cout;
+extern _STLP_DECLSPEC ostream cerr;
+extern _STLP_DECLSPEC ostream clog;
+#endif //__LIBSTD_CPP_SYMBIAN32_WSD__
+
+# ifndef _STLP_NO_WCHAR_T
+# if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
+_STLP_DECLSPEC wostream& GetWCErrStream();
+_STLP_DECLSPEC wostream& GetWCoutStream();
+_STLP_DECLSPEC wostream& GetWClogStream();
+_STLP_DECLSPEC wistream& GetWCinStream(); 
+
+#define wcerr GetWCErrStream()
+#define wcin GetWCinStream()
+#define wcout GetWCoutStream()
+#define wclog GetWClogStream()
+#else //__LIBSTD_CPP_SYMBIAN32_WSD__
+extern _STLP_DECLSPEC wistream wcin;
+extern _STLP_DECLSPEC wostream wcout;
+extern _STLP_DECLSPEC wostream wcerr;
+extern _STLP_DECLSPEC wostream wclog;
+#endif //__LIBSTD_CPP_SYMBIAN32_WSD__
+# endif
+
+# ifndef __LOCALE_INITIALIZED
+#  define __LOCALE_INITIALIZED
+# if !defined(__LIBSTD_CPP_SYMBIAN32_WSD__) && !defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
+// Global initializer object, to ensure initialization of locale subsystem.
+static ios_base::_Loc_init _LocInit;
+# endif
+# endif
+
+# ifndef __IOS_BASE_INITIALIZED
+#  define __IOS_BASE_INITIALIZED
+# if !defined(__LIBSTD_CPP_SYMBIAN32_WSD__) && !defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
+// Global initializer object, to ensure construction of static objects.
+static ios_base::Init _IosInit;
+# endif
+# endif
+
+_STLP_END_NAMESPACE
+
+# elif defined ( _STLP_USE_NO_IOSTREAMS )
+#  include <stl/_null_stream.h>
+# else
+
+#  include <wrap_std/iostream>
+
+# endif /* STL_USE_NO_IOSTREAMS */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1037)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_IOSTREAM */
+
+// Local Variables:
+// mode:C++
+// End: