diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_locale.h
--- a/epoc32/include/stdapis/stlportv5/stl/_locale.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/stdapis/stlportv5/stl/_locale.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
- * 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 
+ * 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
 // file directly.
@@ -25,88 +25,92 @@
 #ifndef _STLP_INTERNAL_LOCALE_H
 #define _STLP_INTERNAL_LOCALE_H
 
-#ifndef _STLP_CSTDLIB
-# include <cstdlib>
+#ifndef _STLP_INTERNAL_CSTDLIB
+#  include <stl/_cstdlib.h>
 #endif
 
-#ifndef _STLP_CWCHAR_H
-# include <stl/_cwchar.h>
+#ifndef _STLP_INTERNAL_CWCHAR
+#  include <stl/_cwchar.h>
 #endif
 
 #ifndef _STLP_INTERNAL_THREADS_H
-# include <stl/_threads.h>
+#  include <stl/_threads.h>
 #endif
 
 #ifndef _STLP_STRING_FWD_H
-# include <stl/_string_fwd.h>
+#  include <stl/_string_fwd.h>
 #endif
 
 _STLP_BEGIN_NAMESPACE
 
-class _STLP_CLASS_DECLSPEC _Locale_impl;             // Forward declaration of opaque type.
-class _STLP_CLASS_DECLSPEC _Locale;             // Forward declaration of opaque type.
-class _STLP_CLASS_DECLSPEC locale;
-class _STLP_CLASS_DECLSPEC ios_base;
-
+class _Locale_impl;        // Forward declaration of opaque type.
+class ios_base;
+class locale;
 
 template <class _CharT, class _Traits, class _Alloc>
-bool 
-__locale_do_operator_call (const locale* __that, 
-                           const basic_string<_CharT, _Traits, _Alloc >& __x,
-                           const basic_string<_CharT, _Traits, _Alloc >& __y);
+bool __locale_do_operator_call (const locale& __loc,
+                                const basic_string<_CharT, _Traits, _Alloc>& __x,
+                                const basic_string<_CharT, _Traits, _Alloc>& __y);
 
-#  define _BaseFacet locale::facet
+_STLP_DECLSPEC _Locale_impl * _STLP_CALL _get_Locale_impl( _Locale_impl *locimpl );
+_STLP_DECLSPEC _Locale_impl * _STLP_CALL _copy_Nameless_Locale_impl( _Locale_impl *locimpl );
+
+template <class _Facet>
+bool _HasFacet(const locale& __loc, const _Facet*  /*__facet */ ) _STLP_NOTHROW;
+
+template <class _Facet>
+_Facet* _UseFacet(const locale& __loc, const _Facet* /* __facet */);
+
+#if defined (_STLP_USE_MSVC6_MEM_T_BUG_WORKAROUND)
+#  define locale _STLP_NO_MEM_T_NAME(loc)
+#endif
 
 class _STLP_CLASS_DECLSPEC locale {
 public:
   // types:
-
-  class 
-#if defined (__SYMBIAN32__) || defined(__GCCE__)
-  _STLP_CLASS_DECLSPEC  
-#else
-    _STLP_DECLSPEC 
-#endif
-  facet : private _Refcount_Base {
+  class _STLP_CLASS_DECLSPEC facet : protected _Refcount_Base {
   protected:
-    explicit facet(size_t __no_del = 0) : _Refcount_Base(1), _M_delete(__no_del == 0) {}
-
+    /* Here we filter __init_count user value to 0 or 1 because __init_count is a
+     * size_t instance and _Refcount_Base use __stl_atomic_t instances that might
+     * have lower sizeof and generate roll issues. 1 is enough to keep the facet
+     * alive when required.
+     */
+    explicit facet(size_t __init_count = 0) : _Refcount_Base( __init_count == 0 ? 0 : 1 )
+    	{ if (__init_count ) {/* do nothing. to avoid warnings */} }
     _STLP_DECLSPEC virtual ~facet();
     friend class locale;
     friend class _Locale_impl;
-    friend class _Locale;
-    
+    friend facet * _STLP_CALL _get_facet( facet * );
+    friend void _STLP_CALL _release_facet( facet *& );
+
   private:                        // Invalidate assignment and copying.
-    facet(const facet& __f) : _Refcount_Base(1), _M_delete(__f._M_delete == 0)  {};       
-    void operator=(const facet&); 
-    
-  private:                        // Data members.
-    const bool _M_delete;
+    facet(const facet& ) /* : _Refcount_Base(1) {} */;
+    void operator=(const facet&);
   };
-  
-#if defined(__MVS__) || defined(__OS400__)
+
+#if defined (__MVS__) || defined (__OS400__)
   struct
 #else
   class
 #endif
-  _STLP_DECLSPEC id {
+  _STLP_CLASS_DECLSPEC id {
     friend class locale;
     friend class _Locale_impl;
   public:
     size_t _M_index;
-#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
-   static _STLP_STATIC_MEMBER_DECLSPEC size_t& get_locale_id_S_max();
+#if defined(__SYMBIAN32__WSD__)
+    static inline size_t& get_locale_id_S_max();
 # else
     static size_t _S_max;
 # endif
   };
 
   typedef int category;
-# if defined (_STLP_STATIC_CONST_INIT_BUG)
+#if defined (_STLP_STATIC_CONST_INIT_BUG)
   enum _Category {
-# else
+#else
   static const category
-# endif
+#endif
     none      = 0x000,
     collate   = 0x010,
     ctype     = 0x020,
@@ -115,140 +119,222 @@
     time      = 0x200,
     messages  = 0x400,
     all       = collate | ctype | monetary | numeric | time | messages
-# if defined (_STLP_STATIC_CONST_INIT_BUG)
+#if defined (_STLP_STATIC_CONST_INIT_BUG)
   }
-# endif
+#endif
   ;
 
   // construct/copy/destroy:
-  _STLP_DECLSPEC locale();
+  _STLP_DECLSPEC locale() _STLP_NOTHROW;
   _STLP_DECLSPEC locale(const locale&) _STLP_NOTHROW;
-  explicit locale(const char *);
+  _STLP_DECLSPEC explicit locale(const char *);
   locale(const locale&, const char*, category);
 
+#if defined(__SYMBIAN32__WSD__) || defined (__SYMBIAN32__NO_STATIC_IMPORTS__) 
+#define id GetFacetLocaleId()
+#endif
+
+#if defined (_STLP_MEMBER_TEMPLATES) && !defined (_STLP_USE_MSVC6_MEM_T_BUG_WORKAROUND)
+  template <class _Facet>
+  locale(const locale& __loc, _Facet* __f) {
+    if ( __f != 0 ) {
+      this->_M_impl = _get_Locale_impl( _copy_Nameless_Locale_impl( __loc._M_impl ) );
+      this->_M_insert(__f, _Facet::id);
+    } else {
+      this->_M_impl = _get_Locale_impl( __loc._M_impl );
+    }
+  }
+#if defined(__SYMBIAN32__WSD__) || defined (__SYMBIAN32__NO_STATIC_IMPORTS__) 
+#undef id 
+#endif
+#endif // _STLP_MEMBER_TEMPLATES
+
+protected:
   // those are for internal use
   locale(_Locale_impl*);
-  locale(_Locale_impl*, bool);
 
 public:
 
-# if defined ( _STLP_MEMBER_TEMPLATES ) /* && defined (_STLP_FUNCTION_TMPL_PARTIAL_ORDER) */
-  template <class _Facet> 
-  locale(const locale& __loc, _Facet* __f) : _M_impl(0)
-    {
-      //      _M_impl = this->_S_copy_impl(__loc._M_impl, __f != 0);
-      new(this) locale(__loc._M_impl, __f != 0);
-      if (__f != 0)
-        this->_M_insert((facet*)__f, _Facet::GetFacetLocaleId());
-    }
-# endif
-
   locale(const locale&, const locale&, category);
-  _STLP_DECLSPEC ~locale() _STLP_NOTHROW;
   _STLP_DECLSPEC const locale& operator=(const locale&) _STLP_NOTHROW;
 
-# if !(defined (_STLP_NO_MEMBER_TEMPLATES) || defined (_STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS))
-  template <class _Facet> locale combine(const locale& __loc) const{
-    locale __result(__loc._M_impl, true);
-#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
-    if (facet* __f = __loc._M_get_facet(_Facet::GetFacetLocaleId())) {
-      __result._M_insert((facet*)__f, _Facet::GetFacetLocaleId());
-#else
-    if (facet* __f = __loc._M_get_facet(_Facet::id)) {
-      __result._M_insert((facet*)__f, _Facet::id);
+#if defined (_STLP_USE_MSVC6_MEM_T_BUG_WORKAROUND)
+  virtual
 #endif
-      __f->_M_incr();
-    }
-    else
-      _M_throw_runtime_error();    
-    return __result;
+   _STLP_DECLSPEC ~locale() _STLP_NOTHROW;
+
+#if defined (_STLP_MEMBER_TEMPLATES) && !defined (_STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS) && \
+   !defined(_STLP_USE_MSVC6_MEM_T_BUG_WORKAROUND)
+  template <class _Facet>
+  locale combine(const locale& __loc) const {
+    _Facet *__facet = 0;
+    if (!_HasFacet(__loc, __facet))
+      _M_throw_runtime_error();
+
+    return locale(*this, _UseFacet(__loc, __facet));
   }
-# endif
+#endif // _STLP_MEMBER_TEMPLATES && !_STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+
   // locale operations:
-  _STLP_DECLSPEC string name() const;
+  _STLP_DECLSPEC  string name() const;
 
   _STLP_DECLSPEC bool operator==(const locale&) const;
   _STLP_DECLSPEC bool operator!=(const locale&) const;
 
-# if ! defined ( _STLP_MEMBER_TEMPLATES ) || defined (_STLP_INLINE_MEMBER_TEMPLATES) || (defined(__MWERKS__) && __MWERKS__ <= 0x2301)
-  bool operator()(const string& __x, const string& __y) const;
+#if !defined (_STLP_MEMBER_TEMPLATES) || defined (_STLP_INLINE_MEMBER_TEMPLATES) || (defined(__MWERKS__) && __MWERKS__ <= 0x2301)
+  _STLP_DECLSPEC bool operator()(const string& __x, const string& __y) const;
 #  ifndef _STLP_NO_WCHAR_T
-  bool operator()(const wstring& __x, const wstring& __y) const;
+  _STLP_DECLSPEC bool operator()(const wstring& __x, const wstring& __y) const;
 #  endif
-# else
+#elif !defined (_STLP_USE_MSVC6_MEM_T_BUG_WORKAROUND)
   template <class _CharT, class _Traits, class _Alloc>
   bool operator()(const basic_string<_CharT, _Traits, _Alloc>& __x,
-                  const basic_string<_CharT, _Traits, _Alloc>& __y) const  {
-    return __locale_do_operator_call(this, __x, __y);
-  }              
-# endif
+                  const basic_string<_CharT, _Traits, _Alloc>& __y) const
+  { return __locale_do_operator_call(*this, __x, __y); }
+#endif
 
   // global locale objects:
   _STLP_DECLSPEC static locale _STLP_CALL global(const locale&);
   _STLP_DECLSPEC static const locale& _STLP_CALL classic();
 
-public:                         // Helper functions for locale globals.
+//protected:                         // Helper functions for locale globals.
   _STLP_DECLSPEC facet* _M_get_facet(const id&) const;
   // same, but throws
   _STLP_DECLSPEC facet* _M_use_facet(const id&) const;
-  _STLP_DECLSPEC static void _STLP_CALL _M_throw_runtime_error(const char* = 0);
-  static void _STLP_CALL _S_initialize();
-  static void _STLP_CALL _S_uninitialize();
+  _STLP_DECLSPEC static void _STLP_FUNCTION_THROWS _M_throw_runtime_error(const char* = 0);
 
-private:                        // More helper functions.
-  //  static _Locale_impl* _STLP_CALL _S_copy_impl(_Locale_impl*, bool);
+protected:                        // More helper functions.
   _STLP_DECLSPEC void _M_insert(facet* __f, id& __id);
 
   // friends:
   friend class _Locale_impl;
-  friend class _Locale;
   friend class ios_base;
 
-private:                        // Data members
+protected:                        // Data members
   _Locale_impl* _M_impl;
+  _Locale_impl* _M_get_impl() const { return _M_impl; }
 };
 
+#if defined (_STLP_USE_MSVC6_MEM_T_BUG_WORKAROUND)
+#  undef locale
+#  define _Locale _STLP_NO_MEM_T_NAME(loc)
+
+class locale : public _Locale {
+public:
+
+  // construct/copy/destroy:
+  _STLP_DECLSPEC locale() _STLP_NOTHROW {}
+  locale(const locale& __loc) _STLP_NOTHROW : _Locale(__loc) {}
+  explicit locale(const char *__str) : _Locale(__str) {}
+  locale(const locale& __loc, const char* __str, category __cat)
+    : _Locale(__loc, __str, __cat) {}
+
+  template <class _Facet>
+  locale(const locale& __loc, _Facet* __f) {
+    if ( __f != 0 ) {
+      this->_M_impl = _get_Locale_impl( _copy_Nameless_Locale_impl( __loc._M_impl ) );
+      this->_M_insert(__f, _Facet::id);
+    } else {
+      this->_M_impl = _get_Locale_impl( __loc._M_impl );
+    }
+  }
+
+private:
+  // those are for internal use
+  locale(_Locale_impl* __impl) : _Locale(__impl) {}
+  locale(const _Locale& __loc) : _Locale(__loc) {}
+
+public:
+
+  locale(const locale& __loc1, const locale& __loc2, category __cat)
+    : _Locale(__loc1, __loc2, __cat) {}
+
+  const locale& operator=(const locale& __loc) _STLP_NOTHROW {
+    _Locale::operator=(__loc);
+    return *this;
+  }
+
+  template <class _Facet>
+  locale combine(const locale& __loc) const {
+    _Facet *__facet = 0;
+    if (!_HasFacet(__loc, __facet))
+      _M_throw_runtime_error();
+
+    return locale(*this, _UseFacet(__loc, __facet));
+  }
+
+  // locale operations:
+  bool operator==(const locale& __loc) const { return _Locale::operator==(__loc); }
+  bool operator!=(const locale& __loc) const { return _Locale::operator!=(__loc); }
+
+  template <class _CharT, class _Traits, class _Alloc>
+  bool operator()(const basic_string<_CharT, _Traits, _Alloc>& __x,
+                  const basic_string<_CharT, _Traits, _Alloc>& __y) const
+  { return __locale_do_operator_call(*this, __x, __y); }
+
+  // global locale objects:
+  static locale _STLP_CALL global(const locale& __loc) {
+    return _Locale::global(__loc);
+  }
+  static const locale& _STLP_CALL classic() {
+    return __STATIC_CAST(const locale&, _Locale::classic());
+  }
+
+  // friends:
+  friend class _Locale_impl;
+  friend class ios_base;
+};
+
+#endif /* _STLP_USE_MSVC6_MEM_T_BUG_WORKAROUND */
+
 //----------------------------------------------------------------------
 // locale globals
 
-# ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+#ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
 template <class _Facet>
-inline const _Facet& 
+inline const _Facet&
 _Use_facet<_Facet>::operator *() const
-# else
+#else
 template <class _Facet> inline const _Facet& use_facet(const locale& __loc)
-# endif
+#endif
 {
-#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
-  return *__STATIC_CAST(const _Facet*,__loc._M_use_facet(_Facet::GetFacetLocaleId()));
-#else
-  return *__STATIC_CAST(const _Facet*,__loc._M_use_facet(_Facet::id));
-#endif
+  _Facet *__facet = 0;
+  return *_UseFacet(__loc, __facet);
 }
 
- 
-# ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
-template <class _Facet> 
+
+#ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+template <class _Facet>
 struct has_facet {
   const locale& __loc;
   has_facet(const locale& __p_loc) : __loc(__p_loc) {}
   operator bool() const _STLP_NOTHROW
-# else
-template <class _Facet> inline bool has_facet(const locale& __loc) _STLP_NOTHROW 
-# endif
+#else
+template <class _Facet> inline bool has_facet(const locale& __loc) _STLP_NOTHROW
+#endif
 {
-#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
-  return (__loc._M_get_facet(_Facet::GetFacetLocaleId()) != 0);
-#else
-  return (__loc._M_get_facet(_Facet::id) != 0);
-#endif
+  _Facet *__facet = 0;
+  return _HasFacet(__loc, __facet);
 }
 
-# ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
-  // close class definition
-};
-# endif
+#ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+}; // close class definition
+#endif
+#if defined(__SYMBIAN32__WSD__) || defined (__SYMBIAN32__NO_STATIC_IMPORTS__) 
+#define id GetFacetLocaleId()
+#endif
 
+template <class _Facet>
+bool _HasFacet(const locale& __loc, const _Facet* ) _STLP_NOTHROW
+{ return (__loc._M_get_facet(_Facet::id) != 0); }
+
+template <class _Facet>
+_Facet* _UseFacet(const locale& __loc, const _Facet* )
+{ return __STATIC_CAST(_Facet*, __loc._M_use_facet(_Facet::id)); }
+
+#if defined(__SYMBIAN32__WSD__)  || defined (__SYMBIAN32__NO_STATIC_IMPORTS__) 
+#undef id 
+#endif
 _STLP_END_NAMESPACE
 
 #endif /* _STLP_INTERNAL_LOCALE_H */