1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_iosfwd.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_iosfwd.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,15 +1,15 @@
1.4 -# ifndef _STLP_INTERNAL_IOSFWD
1.5 -# define _STLP_INTERNAL_IOSFWD
1.6 +#ifndef _STLP_INTERNAL_IOSFWD
1.7 +#define _STLP_INTERNAL_IOSFWD
1.8
1.9 -#if defined(__sgi) && !defined(__GNUC__) && !defined(_STANDARD_C_PLUS_PLUS)
1.10 -#error This header file requires the -LANG:std option
1.11 +#if defined (__sgi) && !defined (__GNUC__) && !defined (_STANDARD_C_PLUS_PLUS)
1.12 +# error This header file requires the -LANG:std option
1.13 #endif
1.14
1.15 // This file provides forward declarations of the most important I/O
1.16 // classes. Note that almost all of those classes are class templates,
1.17 -// with default template arguments. According to the C++ standard,
1.18 +// with default template arguments. According to the C++ standard,
1.19 // if a class template is declared more than once in the same scope
1.20 -// then only one of those declarations may have default arguments.
1.21 +// then only one of those declarations may have default arguments.
1.22
1.23 // <iosfwd> contains the same declarations as other headers, and including
1.24 // both <iosfwd> and (say) <iostream> is permitted. This means that only
1.25 @@ -19,107 +19,107 @@
1.26 // template arguments. All of the other I/O headers include <iosfwd>.
1.27
1.28 #ifndef _STLP_CHAR_TRAITS_H
1.29 -# include <stl/char_traits.h>
1.30 +# include <stl/char_traits.h>
1.31 #endif
1.32
1.33 _STLP_BEGIN_NAMESPACE
1.34
1.35 -class _STLP_CLASS_DECLSPEC ios_base;
1.36 +class ios_base;
1.37
1.38 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.39 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.40 class basic_ios;
1.41
1.42 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.43 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.44 class basic_streambuf;
1.45
1.46 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.47 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.48 class basic_istream;
1.49
1.50 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.51 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.52 class basic_ostream;
1.53
1.54 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.55 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.56 class basic_iostream;
1.57
1.58 -template <class _CharT, __DFL_TMPL_PARAM( _Traits , char_traits<_CharT>),
1.59 - __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
1.60 +template <class _CharT, _STLP_DFL_TMPL_PARAM( _Traits , char_traits<_CharT>),
1.61 + _STLP_DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
1.62 class basic_stringbuf;
1.63
1.64 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
1.65 - __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
1.66 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
1.67 + _STLP_DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
1.68 class basic_istringstream;
1.69
1.70 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
1.71 - __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
1.72 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
1.73 + _STLP_DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
1.74 class basic_ostringstream;
1.75
1.76 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
1.77 - __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
1.78 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
1.79 + _STLP_DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
1.80 class basic_stringstream;
1.81
1.82 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.83 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.84 class basic_filebuf;
1.85
1.86 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.87 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.88 class basic_ifstream;
1.89
1.90 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.91 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.92 class basic_ofstream;
1.93
1.94 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.95 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.96 class basic_fstream;
1.97
1.98 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.99 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.100 class istreambuf_iterator;
1.101
1.102 -template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.103 +template <class _CharT, _STLP_DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
1.104 class ostreambuf_iterator;
1.105
1.106 typedef basic_ios<char, char_traits<char> > ios;
1.107
1.108 -# ifndef _STLP_NO_WCHAR_T
1.109 +#if !defined (_STLP_NO_WCHAR_T)
1.110 typedef basic_ios<wchar_t, char_traits<wchar_t> > wios;
1.111 -# endif
1.112 +#endif
1.113
1.114 // Forward declaration of class locale, and of the most important facets.
1.115 class locale;
1.116 -# ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
1.117 +#if defined (_STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS)
1.118 template <class _Facet>
1.119 struct _Use_facet {
1.120 const locale& __loc;
1.121 _Use_facet(const locale& __p_loc) : __loc(__p_loc) {}
1.122 inline const _Facet& operator *() const;
1.123 };
1.124 -# define use_facet *_Use_facet
1.125 -# else
1.126 +# define use_facet *_Use_facet
1.127 +#else
1.128 template <class _Facet> inline const _Facet& use_facet(const locale&);
1.129 -# endif
1.130 +#endif
1.131
1.132 template <class _CharT> class ctype;
1.133 template <class _CharT> class ctype_byname;
1.134 template <class _CharT> class collate;
1.135 template <class _CharT> class collate_byname;
1.136
1.137 -_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype<char>;
1.138 -_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype_byname<char>;
1.139 -_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate<char>;
1.140 -_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate_byname<char>;
1.141 +_STLP_TEMPLATE_NULL class ctype<char>;
1.142 +_STLP_TEMPLATE_NULL class ctype_byname<char>;
1.143 +_STLP_TEMPLATE_NULL class collate<char>;
1.144 +_STLP_TEMPLATE_NULL class collate_byname<char>;
1.145
1.146 -# ifndef _STLP_NO_WCHAR_T
1.147 -_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype<wchar_t>;
1.148 -_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype_byname<wchar_t>;
1.149 -_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate<wchar_t>;
1.150 -_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate_byname<wchar_t>;
1.151 -# endif
1.152 +#if !defined (_STLP_NO_WCHAR_T)
1.153 +_STLP_TEMPLATE_NULL class ctype<wchar_t>;
1.154 +_STLP_TEMPLATE_NULL class ctype_byname<wchar_t>;
1.155 +_STLP_TEMPLATE_NULL class collate<wchar_t>;
1.156 +_STLP_TEMPLATE_NULL class collate_byname<wchar_t>;
1.157 +#endif
1.158
1.159 -# if !(defined (__SUNPRO_CC) && __SUNPRO_CC < 0x500 ) && !defined(_STLP_WINCE)
1.160 +#if !(defined (__SUNPRO_CC) && __SUNPRO_CC < 0x500 )
1.161 // Typedefs for ordinary (narrow-character) streams.
1.162 -_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC basic_streambuf<char, char_traits<char> >;
1.163 -# endif
1.164 +//_STLP_TEMPLATE_NULL class basic_streambuf<char, char_traits<char> >;
1.165 +#endif
1.166
1.167 -typedef basic_istream<char, char_traits<char> > istream;
1.168 -typedef basic_ostream<char, char_traits<char> > ostream;
1.169 -typedef basic_iostream<char, char_traits<char> > iostream;
1.170 +typedef basic_istream<char, char_traits<char> > istream;
1.171 +typedef basic_ostream<char, char_traits<char> > ostream;
1.172 +typedef basic_iostream<char, char_traits<char> > iostream;
1.173 typedef basic_streambuf<char,char_traits<char> > streambuf;
1.174
1.175 typedef basic_stringbuf<char, char_traits<char>, allocator<char> > stringbuf;
1.176 @@ -132,7 +132,7 @@
1.177 typedef basic_ofstream<char, char_traits<char> > ofstream;
1.178 typedef basic_fstream<char, char_traits<char> > fstream;
1.179
1.180 -# ifndef _STLP_NO_WCHAR_T
1.181 +#if !defined (_STLP_NO_WCHAR_T)
1.182 // Typedefs for wide-character streams.
1.183 typedef basic_streambuf<wchar_t, char_traits<wchar_t> > wstreambuf;
1.184 typedef basic_istream<wchar_t, char_traits<wchar_t> > wistream;
1.185 @@ -148,7 +148,7 @@
1.186 typedef basic_ifstream<wchar_t, char_traits<wchar_t> > wifstream;
1.187 typedef basic_ofstream<wchar_t, char_traits<wchar_t> > wofstream;
1.188 typedef basic_fstream<wchar_t, char_traits<wchar_t> > wfstream;
1.189 -# endif
1.190 +#endif
1.191
1.192 _STLP_END_NAMESPACE
1.193