diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_ios.h --- a/epoc32/include/stdapis/stlportv5/stl/_ios.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/stdapis/stlportv5/stl/_ios.h Wed Mar 31 12:33:34 2010 +0100 @@ -1,21 +1,20 @@ /* - * © Portions copyright (c) 2006-2007 Nokia Corporation. All rights reserved. * Copyright (c) 1999 * Silicon Graphics Computer Systems, Inc. * - * 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 * modified is included with the above copyright notice. * - */ + */ #ifndef _STLP_INTERNAL_IOS_H #define _STLP_INTERNAL_IOS_H @@ -45,11 +44,7 @@ // because C++ language rules do not allow it to be declared twice. template -#ifdef __SYMBIAN32__ class basic_ios : public ios_base { -#else -class basic_ios : public ios_base { -#endif friend class ios_base; public: // Synonyms for types. typedef _CharT char_type; @@ -108,7 +103,7 @@ locale imbue(const locale&); inline char narrow(_CharT, char) const ; - inline _CharT widen(char) const; + inline _CharT widen(char) const; // Helper function that makes testing for EOF more convenient. static bool _STLP_CALL _S_eof(int_type __c) { @@ -122,11 +117,11 @@ void init(basic_streambuf<_CharT, _Traits>* __streambuf); public: - + // Helper function used in istream and ostream. It is called only from // a catch clause. void _M_handle_exception(ios_base::iostate __flag); - + private: // Data members char_type _M_fill; // The fill character, used for padding. @@ -137,22 +132,14 @@ template -inline char +inline char basic_ios<_CharT, _Traits>::narrow(_CharT __c, char __default) const -{ return ((const ctype<_CharT>*)this->_M_ctype_facet())->narrow(__c, __default); } +{ return __STATIC_CAST(const ctype<_CharT>*, this->_M_ctype_facet())->narrow(__c, __default); } template -inline _CharT +inline _CharT basic_ios<_CharT, _Traits>::widen(char __c) const -{ - return ((const ctype<_CharT>*)this->_M_ctype_facet())->widen(__c); } - -# if defined (_STLP_USE_TEMPLATE_EXPORT) -_STLP_EXPORT_TEMPLATE_CLASS basic_ios >; -# if ! defined (_STLP_NO_WCHAR_T) -_STLP_EXPORT_TEMPLATE_CLASS basic_ios >; -# endif -# endif /* _STLP_USE_TEMPLATE_EXPORT */ +{ return __STATIC_CAST(const ctype<_CharT>*, this->_M_ctype_facet())->widen(__c); } # if !defined (_STLP_NO_METHOD_SPECIALIZATION) _STLP_TEMPLATE_NULL @@ -170,30 +157,17 @@ } # endif /* _STLP_NO_METHOD_SPECIALIZATION */ +# if defined (_STLP_USE_TEMPLATE_EXPORT) +_STLP_EXPORT_TEMPLATE_CLASS basic_ios >; +# if ! defined (_STLP_NO_WCHAR_T) +_STLP_EXPORT_TEMPLATE_CLASS basic_ios >; +# endif +# endif /* _STLP_USE_TEMPLATE_EXPORT */ _STLP_END_NAMESPACE #if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION) # include -# endif - -// The following is needed to ensure that the inlined _Stl_loc_init functions -// that ios_base::_Loc_init::_Loc_init() calls are found eventually. -// Otherwise, undefined externs may be caused. - -#if defined(__BORLANDC__) && defined(_RTLDLL) -# ifndef _STLP_INTERNAL_NUM_PUT_H -# include -# endif -# ifndef _STLP_INTERNAL_NUM_GET_H -# include -# endif -# ifndef _STLP_INTERNAL_MONETARY_H -# include -# endif -# ifndef _STLP_INTERNAL_TIME_FACETS_H -# include -# endif #endif #endif /* _STLP_IOS */