diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_messages_facets.h --- a/epoc32/include/stdapis/stlportv5/stl/_messages_facets.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/stdapis/stlportv5/stl/_messages_facets.h Wed Mar 31 12:33:34 2010 +0100 @@ -1,22 +1,22 @@ /* - * © Portions copyright (c) 2006-2007 Nokia Corporation. All rights reserved. + * Portions Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). 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. * - */ + */ // WARNING: This is an internal header file, included by other C++ // standard library headers. You should not attempt to use this header @@ -27,15 +27,15 @@ #define _STLP_INTERNAL_MESSAGES_H #ifndef _STLP_IOS_BASE_H -# include +# include #endif -# ifndef _STLP_C_LOCALE_H +#ifndef _STLP_C_LOCALE_H # include -# endif +#endif -#ifndef _STLP_STRING_H -# include +#ifndef _STLP_INTERNAL_STRING_H +# include #endif _STLP_BEGIN_NAMESPACE @@ -43,77 +43,76 @@ // messages facets class messages_base { -public: - typedef int catalog; + public: + typedef int catalog; }; template class messages {}; +_STLP_MOVE_TO_PRIV_NAMESPACE class _Messages; +_STLP_MOVE_TO_STD_NAMESPACE _STLP_TEMPLATE_NULL -#ifdef __SYMBIAN32__ -class messages : public locale::facet, public messages_base -#else -class _STLP_CLASS_DECLSPEC messages : public locale::facet, public messages_base -#endif -{ - friend class _Locale; +class _STLP_CLASS_DECLSPEC messages : public locale::facet, public messages_base { + friend class _Locale_impl; public: typedef messages_base::catalog catalog; typedef char char_type; typedef string string_type; - _STLP_DECLSPEC explicit messages(size_t __refs = 0); + _STLP_DECLSPEC explicit messages(size_t __refs = 0); - catalog open(const string& __fn, const locale& __loc) const - { return do_open(__fn, __loc); } + catalog open(const string& __fn, const locale& __loc) const + { return do_open(__fn, __loc); } string_type get(catalog __c, int __set, int __msgid, - const string_type& __dfault) const - { return do_get(__c, __set, __msgid, __dfault); } + const string_type& __dfault) const + { return do_get(__c, __set, __msgid, __dfault); } inline void close(catalog __c) const - { do_close(__c); } + { do_close(__c); } -#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_) - _STLP_STATIC_MEMBER_DECLSPEC static locale::id& GetFacetLocaleId(); +#if defined(__SYMBIAN32__WSD__) + static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId(); +#elif defined (__SYMBIAN32__NO_STATIC_IMPORTS__) + static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId(); + static locale::id id; #else - _STLP_STATIC_MEMBER_DECLSPEC static locale::id id; + // NOTE: Symbian doesn't support exporting static data. + // Users of this class should use GetFacetLocaleId() to access the data member id + static _STLP_STATIC_MEMBER_DECLSPEC locale::id id; #endif - _STLP_DECLSPEC messages(_Messages*); +private: + _STLP_DECLSPEC messages(_STLP_PRIV _Messages*); protected: - _STLP_DECLSPEC messages(size_t, _Locale_messages*); -_STLP_DECLSPEC ~messages(); + _STLP_DECLSPEC messages(size_t, _Locale_messages*); + _STLP_DECLSPEC ~messages(); -_STLP_DECLSPEC virtual catalog do_open(const string& __fn, const locale& __loc) const; -_STLP_DECLSPEC virtual string_type do_get(catalog __c, int __set, int __msgid, + + _STLP_DECLSPEC virtual catalog do_open(const string& __fn, const locale& __loc) const; + _STLP_DECLSPEC virtual string_type do_get(catalog __c, int __set, int __msgid, const string_type& __dfault) const; -_STLP_DECLSPEC virtual void do_close(catalog __c) const; + _STLP_DECLSPEC virtual void do_close(catalog __c) const; void _M_initialize(const char* __name); private: - _Messages* _M_impl; + _STLP_PRIV _Messages* _M_impl; }; -# if !defined (_STLP_NO_WCHAR_T) +#if !defined (_STLP_NO_WCHAR_T) _STLP_TEMPLATE_NULL -#ifdef __SYMBIAN32__ -class messages : public locale::facet, public messages_base -#else -class _STLP_CLASS_DECLSPEC messages : public locale::facet, public messages_base -#endif -{ - friend class _Locale; +class _STLP_CLASS_DECLSPEC messages : public locale::facet, public messages_base { + friend class _Locale_impl; public: typedef messages_base::catalog catalog; typedef wchar_t char_type; typedef wstring string_type; -_STLP_DECLSPEC explicit messages(size_t __refs = 0); - + explicit messages(size_t __refs = 0); + inline catalog open(const string& __fn, const locale& __loc) const { return do_open(__fn, __loc); } inline string_type get(catalog __c, int __set, int __msgid, @@ -122,31 +121,36 @@ inline void close(catalog __c) const { do_close(__c); } -#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_) - _STLP_STATIC_MEMBER_DECLSPEC static locale::id& GetFacetLocaleId(); +#if defined(__SYMBIAN32__WSD__) + static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId(); +#elif defined (__SYMBIAN32__NO_STATIC_IMPORTS__) + static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId(); + static locale::id id; #else - _STLP_STATIC_MEMBER_DECLSPEC static locale::id id; + // NOTE: Symbian doesn't support exporting static data. + // Users of this class should use GetFacetLocaleId() to access the data member id + static _STLP_STATIC_MEMBER_DECLSPEC locale::id id; #endif - _STLP_DECLSPEC messages(_Messages*); +private: + _STLP_DECLSPEC messages(_STLP_PRIV _Messages*); protected: + _STLP_DECLSPEC messages(size_t, _Locale_messages*); + _STLP_DECLSPEC ~messages(); -_STLP_DECLSPEC messages(size_t, _Locale_messages*); -_STLP_DECLSPEC ~messages(); - -_STLP_DECLSPEC virtual catalog do_open(const string& __fn, const locale& __loc) const; -_STLP_DECLSPEC virtual string_type do_get(catalog __c, int __set, int __msgid, + _STLP_DECLSPEC virtual catalog do_open(const string& __fn, const locale& __loc) const; + _STLP_DECLSPEC virtual string_type do_get(catalog __c, int __set, int __msgid, const string_type& __dfault) const; -_STLP_DECLSPEC virtual void do_close(catalog __c) const; + _STLP_DECLSPEC virtual void do_close(catalog __c) const; void _M_initialize(const char* __name); private: - _Messages* _M_impl; + _STLP_PRIV _Messages* _M_impl; }; -# endif /* WCHAR_T */ +#endif template class messages_byname {}; @@ -156,25 +160,37 @@ typedef messages_base::catalog catalog; typedef string string_type; - _STLP_DECLSPEC explicit messages_byname(const char* __name, size_t __refs = 0); + _STLP_DECLSPEC explicit messages_byname(const char* __name, size_t __refs = 0, _Locale_name_hint* __hint = 0); protected: -_STLP_DECLSPEC ~messages_byname(); + ~messages_byname(); + +private: + typedef messages_byname _Self; + //explicitely defined as private to avoid warnings: + messages_byname(_Self const&); + _Self& operator = (_Self const&); }; -# ifndef _STLP_NO_WCHAR_T +#if !defined (_STLP_NO_WCHAR_T) _STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC messages_byname : public messages { public: typedef messages_base::catalog catalog; typedef wstring string_type; -_STLP_DECLSPEC explicit messages_byname(const char* __name, size_t __refs = 0); + _STLP_DECLSPEC explicit messages_byname(const char* __name, size_t __refs = 0, _Locale_name_hint* __hint = 0); protected: -_STLP_DECLSPEC ~messages_byname(); + ~messages_byname(); + +private: + typedef messages_byname _Self; + //explicitely defined as private to avoid warnings: + messages_byname(_Self const&); + _Self& operator = (_Self const&); }; -# endif /* WCHAR_T */ +#endif /* WCHAR_T */ _STLP_END_NAMESPACE