diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_iosfwd.h
--- a/epoc32/include/stdapis/stlportv5/stl/_iosfwd.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/stdapis/stlportv5/stl/_iosfwd.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,15 +1,15 @@
-# ifndef _STLP_INTERNAL_IOSFWD
-#  define _STLP_INTERNAL_IOSFWD
+#ifndef _STLP_INTERNAL_IOSFWD
+#define _STLP_INTERNAL_IOSFWD
 
-#if defined(__sgi) && !defined(__GNUC__) && !defined(_STANDARD_C_PLUS_PLUS)
-#error This header file requires the -LANG:std option
+#if defined (__sgi) && !defined (__GNUC__) && !defined (_STANDARD_C_PLUS_PLUS)
+#  error This header file requires the -LANG:std option
 #endif
 
 // This file provides forward declarations of the most important I/O
 // classes.  Note that almost all of those classes are class templates,
-// with default template arguments.  According to the C++ standard, 
+// with default template arguments.  According to the C++ standard,
 // if a class template is declared more than once in the same scope
-// then only one of those declarations may have default arguments.  
+// then only one of those declarations may have default arguments.
 
 // <iosfwd> contains the same declarations as other headers, and including
 // both <iosfwd> and (say) <iostream> is permitted.  This means that only
@@ -19,107 +19,107 @@
 // template arguments.  All of the other I/O headers include <iosfwd>.
 
 #ifndef _STLP_CHAR_TRAITS_H
-# include <stl/char_traits.h>
+#  include <stl/char_traits.h>
 #endif
 
 _STLP_BEGIN_NAMESPACE
 
-class _STLP_CLASS_DECLSPEC ios_base;
+class ios_base;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
 class basic_ios;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
 class basic_streambuf;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
 class basic_istream;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
 class basic_ostream;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
 class basic_iostream;
 
-template <class _CharT, __DFL_TMPL_PARAM( _Traits , char_traits<_CharT>),
-          __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM( _Traits , char_traits<_CharT>),
+          _STLP_DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
 class basic_stringbuf;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
-          __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
+          _STLP_DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
 class basic_istringstream;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
-          __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
+          _STLP_DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
 class basic_ostringstream;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
-          __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
+          _STLP_DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
 class basic_stringstream;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
 class basic_filebuf;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
 class basic_ifstream;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
 class basic_ofstream;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
 class basic_fstream;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
 class istreambuf_iterator;
 
-template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
 class ostreambuf_iterator;
 
 typedef basic_ios<char, char_traits<char> >    ios;
 
-# ifndef _STLP_NO_WCHAR_T
+#if !defined (_STLP_NO_WCHAR_T)
 typedef basic_ios<wchar_t, char_traits<wchar_t> > wios;
-# endif
+#endif
 
 // Forward declaration of class locale, and of the most important facets.
 class locale;
-# ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+#if defined (_STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS)
 template <class _Facet>
 struct _Use_facet {
   const locale& __loc;
   _Use_facet(const locale& __p_loc) : __loc(__p_loc) {}
   inline const _Facet& operator *() const;
 };
-# define use_facet *_Use_facet
-# else
+#  define use_facet *_Use_facet
+#else
 template <class _Facet> inline const _Facet& use_facet(const locale&);
-# endif
+#endif
 
 template <class _CharT> class ctype;
 template <class _CharT> class ctype_byname;
 template <class _CharT> class collate;
 template <class _CharT> class collate_byname;
 
-_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype<char>;
-_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype_byname<char>;
-_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate<char>;
-_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate_byname<char>;
+_STLP_TEMPLATE_NULL class ctype<char>;
+_STLP_TEMPLATE_NULL class ctype_byname<char>;
+_STLP_TEMPLATE_NULL class collate<char>;
+_STLP_TEMPLATE_NULL class collate_byname<char>;
 
-#  ifndef _STLP_NO_WCHAR_T
-_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype<wchar_t>;
-_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype_byname<wchar_t>;
-_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate<wchar_t>;
-_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate_byname<wchar_t>;
-#  endif
+#if !defined (_STLP_NO_WCHAR_T)
+_STLP_TEMPLATE_NULL class ctype<wchar_t>;
+_STLP_TEMPLATE_NULL class ctype_byname<wchar_t>;
+_STLP_TEMPLATE_NULL class collate<wchar_t>;
+_STLP_TEMPLATE_NULL class collate_byname<wchar_t>;
+#endif
 
-# if !(defined (__SUNPRO_CC) && __SUNPRO_CC < 0x500 ) && !defined(_STLP_WINCE)
+#if !(defined (__SUNPRO_CC) && __SUNPRO_CC < 0x500 )
 // Typedefs for ordinary (narrow-character) streams.
-_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC basic_streambuf<char, char_traits<char> >;
-# endif
+//_STLP_TEMPLATE_NULL class basic_streambuf<char, char_traits<char> >;
+#endif
 
-typedef basic_istream<char, char_traits<char> >   istream;
-typedef basic_ostream<char, char_traits<char> >   ostream;
-typedef basic_iostream<char, char_traits<char> >  iostream;
+typedef basic_istream<char, char_traits<char> >  istream;
+typedef basic_ostream<char, char_traits<char> >  ostream;
+typedef basic_iostream<char, char_traits<char> > iostream;
 typedef basic_streambuf<char,char_traits<char> > streambuf;
 
 typedef basic_stringbuf<char, char_traits<char>, allocator<char> >     stringbuf;
@@ -132,7 +132,7 @@
 typedef basic_ofstream<char, char_traits<char> > ofstream;
 typedef basic_fstream<char, char_traits<char> >  fstream;
 
-# ifndef _STLP_NO_WCHAR_T
+#if !defined (_STLP_NO_WCHAR_T)
 // Typedefs for wide-character streams.
 typedef basic_streambuf<wchar_t, char_traits<wchar_t> > wstreambuf;
 typedef basic_istream<wchar_t, char_traits<wchar_t> >   wistream;
@@ -148,7 +148,7 @@
 typedef basic_ifstream<wchar_t, char_traits<wchar_t> > wifstream;
 typedef basic_ofstream<wchar_t, char_traits<wchar_t> > wofstream;
 typedef basic_fstream<wchar_t, char_traits<wchar_t> >  wfstream;
-# endif
+#endif
 
 _STLP_END_NAMESPACE