epoc32/include/stdapis/stlportv5/stl/_codecvt.h
branchSymbian3
changeset 4 837f303aceeb
parent 3 e1b950c65cb4
     1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_codecvt.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_codecvt.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,22 +1,22 @@
     1.4  /*
     1.5 - * © Portions copyright (c) 2006-2007 Nokia Corporation.  All rights reserved.
     1.6 + * Portions Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
     1.7   *
     1.8   * Copyright (c) 1999
     1.9   * Silicon Graphics Computer Systems, Inc.
    1.10   *
    1.11 - * Copyright (c) 1999 
    1.12 + * Copyright (c) 1999
    1.13   * Boris Fomitchev
    1.14   *
    1.15   * This material is provided "as is", with absolutely no warranty expressed
    1.16   * or implied. Any use is at your own risk.
    1.17   *
    1.18 - * Permission to use or copy this software for any purpose is hereby granted 
    1.19 + * Permission to use or copy this software for any purpose is hereby granted
    1.20   * without fee, provided the above notices are retained on all copies.
    1.21   * Permission to modify the code and to distribute modified code is granted,
    1.22   * provided the above notices are retained, and a notice that the code was
    1.23   * modified is included with the above copyright notice.
    1.24   *
    1.25 - */ 
    1.26 + */
    1.27  // WARNING: This is an internal header file, included by other C++
    1.28  // standard library headers.  You should not attempt to use this header
    1.29  // file directly.
    1.30 @@ -25,12 +25,17 @@
    1.31  #ifndef _STLP_INTERNAL_CODECVT_H
    1.32  #define _STLP_INTERNAL_CODECVT_H
    1.33  
    1.34 -# ifndef _STLP_C_LOCALE_H
    1.35 +#ifndef _STLP_C_LOCALE_H
    1.36  #  include <stl/c_locale.h>
    1.37 -# endif
    1.38 -# ifndef _STLP_INTERNAL_LOCALE_H
    1.39 +#endif
    1.40 +
    1.41 +#ifndef _STLP_INTERNAL_LOCALE_H
    1.42  #  include <stl/_locale.h>
    1.43 -# endif
    1.44 +#endif
    1.45 +
    1.46 +#ifndef _STLP_INTERNAL_ALGOBASE_H
    1.47 +#  include <stl/_algobase.h>
    1.48 +#endif
    1.49  
    1.50  _STLP_BEGIN_NAMESPACE
    1.51  
    1.52 @@ -41,37 +46,158 @@
    1.53  
    1.54  template <class _InternT, class _ExternT, class _StateT>
    1.55  class codecvt : public locale::facet, public codecvt_base {
    1.56 +public:
    1.57    typedef _InternT intern_type;
    1.58    typedef _ExternT extern_type;
    1.59    typedef _StateT state_type;
    1.60 +
    1.61 +#if defined (_STLP_MSVC) && (_STLP_MSVC < 1300)
    1.62 +  /* For the moment VC6 do not support this facet default implementation
    1.63 +   * because of the static locale::id instance. When VC6 see this definition
    1.64 +   * it goes crasy with locale::id static instances and all the has_facet tests
    1.65 +   * unit tests are failing.
    1.66 +   */
    1.67  };
    1.68 - 
    1.69 +#else
    1.70 +  explicit codecvt(size_t __refs = 0) : locale::facet(__refs) {}
    1.71 +
    1.72 +  result out(state_type&          __state,
    1.73 +             const intern_type*   __from,
    1.74 +             const intern_type*   __from_end,
    1.75 +             const intern_type*&  __from_next,
    1.76 +             extern_type*         __to,
    1.77 +             extern_type*         __to_limit,
    1.78 +             extern_type*&        __to_next) const {
    1.79 +    return do_out(__state,
    1.80 +                  __from, __from_end, __from_next,
    1.81 +                  __to,   __to_limit, __to_next);
    1.82 +  }
    1.83 +
    1.84 +  result unshift(state_type&    __state,
    1.85 +                 extern_type*   __to,
    1.86 +                 extern_type*   __to_limit,
    1.87 +                 extern_type*&  __to_next) const {
    1.88 +    return do_unshift(__state, __to, __to_limit, __to_next);
    1.89 +  }
    1.90 +
    1.91 +  result in(state_type&         __state,
    1.92 +            const extern_type*  __from,
    1.93 +            const extern_type*  __from_end,
    1.94 +            const extern_type*& __from_next,
    1.95 +            intern_type*        __to,
    1.96 +            intern_type*        __to_limit,
    1.97 +            intern_type*&       __to_next) const {
    1.98 +    return do_in(__state,
    1.99 +                 __from, __from_end, __from_next,
   1.100 +                 __to,  __to_limit, __to_next);
   1.101 +  }
   1.102 +
   1.103 +  int encoding() const _STLP_NOTHROW { return do_encoding(); }
   1.104 +
   1.105 +  bool always_noconv() const _STLP_NOTHROW { return do_always_noconv(); }
   1.106 +
   1.107 +  int length(const state_type&  __state,
   1.108 +             const extern_type* __from,
   1.109 +             const extern_type* __end,
   1.110 +             size_t             __max) const {
   1.111 +    return do_length(__state, __from, __end, __max);
   1.112 +  }
   1.113 +
   1.114 +  int max_length() const _STLP_NOTHROW { return do_max_length(); }
   1.115 +
   1.116 +#if defined(__SYMBIAN32__WSD__) 
   1.117 +    static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId();
   1.118 +#elif defined (__SYMBIAN32__NO_STATIC_IMPORTS__)    
   1.119 +    static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId();
   1.120 +    static locale::id id;   
   1.121 +#else        
   1.122 +    // NOTE: Symbian doesn't support exporting static data.  
   1.123 +    // Users of this class should use GetFacetLocaleId() to access the data member id    
   1.124 +    static _STLP_STATIC_MEMBER_DECLSPEC locale::id id;
   1.125 +#endif
   1.126 +
   1.127 +    
   1.128 +protected:
   1.129 +  ~codecvt() {}
   1.130 +
   1.131 +  virtual result do_out(state_type&,
   1.132 +                        const intern_type*  __from,
   1.133 +                        const intern_type*,
   1.134 +                        const intern_type*& __from_next,
   1.135 +                        extern_type*        __to,
   1.136 +                        extern_type*,
   1.137 +                        extern_type*&       __to_next) const
   1.138 +  { __from_next = __from; __to_next   = __to; return noconv; }
   1.139 +
   1.140 +  virtual result do_in (state_type&,
   1.141 +                        const extern_type*  __from,
   1.142 +                        const extern_type*,
   1.143 +                        const extern_type*& __from_next,
   1.144 +                        intern_type*        __to,
   1.145 +                        intern_type*,
   1.146 +                        intern_type*&       __to_next) const
   1.147 +  { __from_next = __from; __to_next = __to; return noconv; }
   1.148 +
   1.149 +  virtual result do_unshift(state_type&,
   1.150 +                            extern_type* __to,
   1.151 +                            extern_type*,
   1.152 +                            extern_type*& __to_next) const
   1.153 +  { __to_next = __to; return noconv; }
   1.154 +
   1.155 +  virtual int do_encoding() const _STLP_NOTHROW
   1.156 +  { return 1; }
   1.157 +
   1.158 +  virtual bool do_always_noconv() const _STLP_NOTHROW
   1.159 +  { return true; }
   1.160 +
   1.161 +  virtual int do_length(const state_type&,
   1.162 +                        const extern_type* __from,
   1.163 +                        const extern_type* __end,
   1.164 +                        size_t __max) const
   1.165 +  { return (int)(min) ( __STATIC_CAST(size_t, (__end - __from)), __max); }
   1.166 +
   1.167 +  virtual int do_max_length() const _STLP_NOTHROW
   1.168 +  { return 1; }
   1.169 +
   1.170 +private:
   1.171 +  codecvt(const codecvt<intern_type, extern_type, state_type>&);
   1.172 +  codecvt<intern_type, extern_type, state_type>& operator = (const codecvt<intern_type, extern_type, state_type>&);
   1.173 +};
   1.174 +
   1.175 +#  if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION)
   1.176 +#    if (_STLP_STATIC_TEMPLATE_DATA > 0)
   1.177 +#      if !defined (__BORLANDC__) && !defined(__SYMBIAN32__WSD__)
   1.178 +template <class _InternT, class _ExternT, class _StateT>
   1.179 +locale::id codecvt<_InternT, _ExternT, _StateT>::id;
   1.180 +#      endif
   1.181 +#    endif
   1.182 +#  endif
   1.183 +#endif
   1.184 +
   1.185  template <class _InternT, class _ExternT, class _StateT>
   1.186  class codecvt_byname : public codecvt<_InternT, _ExternT, _StateT> {};
   1.187  
   1.188  _STLP_TEMPLATE_NULL
   1.189 -#ifdef __SYMBIAN32__
   1.190 -class codecvt<char, char, mbstate_t> : public locale::facet, public codecvt_base
   1.191 -#else
   1.192 -class _STLP_CLASS_DECLSPEC codecvt<char, char, mbstate_t> : public locale::facet, public codecvt_base
   1.193 -#endif
   1.194 +class _STLP_CLASS_DECLSPEC codecvt<char, char, mbstate_t>
   1.195 +  : public locale::facet, public codecvt_base
   1.196  {
   1.197 -  friend class _Locale;
   1.198 +  friend class _Locale_impl;
   1.199 +
   1.200  public:
   1.201    typedef char       intern_type;
   1.202    typedef char       extern_type;
   1.203    typedef mbstate_t  state_type;
   1.204  
   1.205 -  explicit codecvt(size_t __refs = 0) : _BaseFacet(__refs) {}
   1.206 +  explicit codecvt(size_t __refs = 0) : locale::facet(__refs) {}
   1.207  
   1.208 -  result out(state_type&  __state,
   1.209 +  result out(mbstate_t&   __state,
   1.210               const char*  __from,
   1.211               const char*  __from_end,
   1.212               const char*& __from_next,
   1.213               char*        __to,
   1.214 -             char*        __to_limit, 
   1.215 +             char*        __to_limit,
   1.216               char*&       __to_next) const {
   1.217 -    return do_out(__state, 
   1.218 +    return do_out(__state,
   1.219                    __from, __from_end, __from_next,
   1.220                    __to,   __to_limit, __to_next);
   1.221    }
   1.222 @@ -79,13 +205,13 @@
   1.223    result unshift(mbstate_t& __state,
   1.224                   char* __to, char* __to_limit, char*& __to_next) const
   1.225      { return do_unshift(__state, __to, __to_limit, __to_next); }
   1.226 -    
   1.227 +
   1.228    result in(state_type&   __state,
   1.229              const char*  __from,
   1.230 -            const char*  __from_end,  
   1.231 +            const char*  __from_end,
   1.232              const char*& __from_next,
   1.233 -            char*        __to, 
   1.234 -            char*        __to_limit, 
   1.235 +            char*        __to,
   1.236 +            char*        __to_limit,
   1.237              char*&       __to_next) const {
   1.238      return do_in(__state,
   1.239                   __from, __from_end, __from_next,
   1.240 @@ -100,17 +226,20 @@
   1.241               const char* __from, const char* __end,
   1.242               size_t __max) const
   1.243      { return do_length(__state, __from, __end, __max); }
   1.244 -  
   1.245 +
   1.246    int max_length() const _STLP_NOTHROW { return do_max_length(); }
   1.247 -
   1.248 -#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
   1.249 -    _STLP_STATIC_MEMBER_DECLSPEC static locale::id& GetFacetLocaleId();
   1.250 +#if defined(__SYMBIAN32__WSD__) 
   1.251 +  static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId();
   1.252 +#elif defined (__SYMBIAN32__NO_STATIC_IMPORTS__)    
   1.253 +    static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId();
   1.254 +    static locale::id id;     
   1.255  #else
   1.256 -  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
   1.257 +  // NOTE: Symbian doesn't support exporting static data.  
   1.258 +  // Users of this class should use GetFacetLocaleId() to access the data member id    
   1.259 +  static _STLP_STATIC_MEMBER_DECLSPEC locale::id id;
   1.260  #endif
   1.261 -
   1.262  protected:
   1.263 -_STLP_DECLSPEC  ~codecvt();
   1.264 +  _STLP_DECLSPEC ~codecvt();
   1.265  
   1.266    _STLP_DECLSPEC virtual result do_out(mbstate_t&   /* __state */,
   1.267                          const char*  __from,
   1.268 @@ -120,7 +249,7 @@
   1.269                          char*        /* __to_limit */,
   1.270                          char*&       __to_next) const;
   1.271  
   1.272 -    _STLP_DECLSPEC virtual result do_in (mbstate_t&   /* __state */ , 
   1.273 +  _STLP_DECLSPEC virtual result do_in (mbstate_t&   /* __state */ ,
   1.274                          const char*  __from,
   1.275                          const char*  /* __from_end */,
   1.276                          const char*& __from_next,
   1.277 @@ -128,41 +257,38 @@
   1.278                          char*        /* __to_end */,
   1.279                          char*&       __to_next) const;
   1.280  
   1.281 -  _STLP_DECLSPEC   virtual result do_unshift(mbstate_t& /* __state */,
   1.282 +  _STLP_DECLSPEC virtual result do_unshift(mbstate_t& /* __state */,
   1.283                              char*      __to,
   1.284                              char*      /* __to_limit */,
   1.285                              char*&     __to_next) const;
   1.286  
   1.287 -  _STLP_DECLSPEC   virtual int do_encoding() const _STLP_NOTHROW;
   1.288 -  _STLP_DECLSPEC   virtual bool do_always_noconv() const _STLP_NOTHROW;
   1.289 -  _STLP_DECLSPEC   virtual int do_length(const mbstate_t&         __state,
   1.290 -                        const  char* __from, 
   1.291 +  _STLP_DECLSPEC virtual int do_encoding() const _STLP_NOTHROW;
   1.292 +  _STLP_DECLSPEC virtual bool do_always_noconv() const _STLP_NOTHROW;
   1.293 +  _STLP_DECLSPEC virtual int do_length(const mbstate_t&         __state,
   1.294 +                        const  char* __from,
   1.295                          const  char* __end,
   1.296                          size_t __max) const;
   1.297 -  _STLP_DECLSPEC   virtual int do_max_length() const _STLP_NOTHROW;
   1.298 +  _STLP_DECLSPEC virtual int do_max_length() const _STLP_NOTHROW;
   1.299  private:
   1.300    codecvt(const codecvt<char, char, mbstate_t>&);
   1.301 -  codecvt<char, char, mbstate_t>& operator =(const codecvt<char, char, mbstate_t>&); 
   1.302 +  codecvt<char, char, mbstate_t>& operator =(const codecvt<char, char, mbstate_t>&);
   1.303  };
   1.304  
   1.305  # ifndef _STLP_NO_WCHAR_T
   1.306 - 
   1.307 +
   1.308  _STLP_TEMPLATE_NULL
   1.309 -#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
   1.310 -class codecvt<wchar_t, char, mbstate_t>  : public locale::facet, public codecvt_base
   1.311 -#else
   1.312 -class _STLP_CLASS_DECLSPEC codecvt<wchar_t, char, mbstate_t>  : public locale::facet, public codecvt_base
   1.313 -#endif
   1.314 +class _STLP_CLASS_DECLSPEC codecvt<wchar_t, char, mbstate_t>
   1.315 +  : public locale::facet, public codecvt_base
   1.316  {
   1.317 -  friend class _Locale;
   1.318 +  friend class _Locale_impl;
   1.319  public:
   1.320    typedef wchar_t    intern_type;
   1.321    typedef char       extern_type;
   1.322    typedef mbstate_t  state_type;
   1.323  
   1.324 -  explicit codecvt(size_t __refs = 0) : _BaseFacet(__refs) {}
   1.325 +  explicit codecvt(size_t __refs = 0) : locale::facet(__refs) {}
   1.326  
   1.327 -  result out(mbstate_t&       __state,
   1.328 +  result out(mbstate_t&      __state,
   1.329               const wchar_t*  __from,
   1.330               const wchar_t*  __from_end,
   1.331               const wchar_t*& __from_next,
   1.332 @@ -170,7 +296,7 @@
   1.333               char*           __to_limit,
   1.334               char*&          __to_next) const {
   1.335      return do_out(__state,
   1.336 -                  __from, __from_end, __from_next, 
   1.337 +                  __from, __from_end, __from_next,
   1.338                    __to,   __to_limit, __to_next);
   1.339    }
   1.340  
   1.341 @@ -178,41 +304,43 @@
   1.342                   char*  __to, char*  __to_limit, char*& __to_next) const {
   1.343      return do_unshift(__state, __to, __to_limit, __to_next);
   1.344    }
   1.345 -    
   1.346 -  result in(mbstate_t&    __state,
   1.347 +
   1.348 +  result in(mbstate_t&   __state,
   1.349              const char*  __from,
   1.350 -            const char*  __from_end,  
   1.351 +            const char*  __from_end,
   1.352              const char*& __from_next,
   1.353 -            wchar_t*     __to, 
   1.354 -            wchar_t*     __to_limit, 
   1.355 +            wchar_t*     __to,
   1.356 +            wchar_t*     __to_limit,
   1.357              wchar_t*&    __to_next) const {
   1.358 -    return do_in(__state, 
   1.359 +    return do_in(__state,
   1.360                   __from, __from_end, __from_next,
   1.361 -                 __to,  __to_limit, __to_next);
   1.362 +                 __to,   __to_limit, __to_next);
   1.363    }
   1.364  
   1.365    int encoding() const _STLP_NOTHROW { return do_encoding(); }
   1.366  
   1.367    bool always_noconv() const _STLP_NOTHROW { return do_always_noconv(); }
   1.368  
   1.369 -  int length(const mbstate_t&        __state,
   1.370 -             const char* __from,
   1.371 -             const char* __end,
   1.372 -             size_t             __max) const
   1.373 +  int length(const mbstate_t& __state,
   1.374 +             const char* __from, const char* __end,
   1.375 +             size_t __max) const
   1.376      { return do_length(__state, __from, __end, __max); }
   1.377 -  
   1.378 +
   1.379    int max_length() const _STLP_NOTHROW { return do_max_length(); }
   1.380 +#if defined(__SYMBIAN32__WSD__) 
   1.381 +  static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId();
   1.382 +#elif defined (__SYMBIAN32__NO_STATIC_IMPORTS__)    
   1.383 +  static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId();
   1.384 +  static locale::id id;   
   1.385 +#else
   1.386 +  // NOTE: Symbian doesn't support exporting static data.  
   1.387 +  // Users of this class should use GetFacetLocaleId() to access the data member id  
   1.388 +  static _STLP_STATIC_MEMBER_DECLSPEC locale::id id;
   1.389 +#endif
   1.390 +protected:
   1.391 +  _STLP_DECLSPEC ~codecvt();
   1.392  
   1.393 -#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
   1.394 -	_STLP_STATIC_MEMBER_DECLSPEC static locale::id& GetFacetLocaleId();
   1.395 -#else
   1.396 -  	_STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
   1.397 -#endif
   1.398 -
   1.399 -protected:
   1.400 -    _STLP_DECLSPEC  ~codecvt();
   1.401 -
   1.402 -  _STLP_DECLSPEC   virtual result do_out(mbstate_t&         __state,
   1.403 +  _STLP_DECLSPEC virtual result do_out(mbstate_t&         __state,
   1.404                          const wchar_t*  __from,
   1.405                          const wchar_t*  __from_end,
   1.406                          const wchar_t*& __from_next,
   1.407 @@ -220,7 +348,7 @@
   1.408                          char*        __to_limit,
   1.409                          char*&       __to_next) const;
   1.410  
   1.411 -  _STLP_DECLSPEC   virtual result do_in (mbstate_t&         __state,
   1.412 +  _STLP_DECLSPEC virtual result do_in (mbstate_t&         __state,
   1.413                          const char*  __from,
   1.414                          const char*  __from_end,
   1.415                          const char*& __from_next,
   1.416 @@ -228,25 +356,25 @@
   1.417                          wchar_t*        __to_limit,
   1.418                          wchar_t*&       __to_next) const;
   1.419  
   1.420 -  _STLP_DECLSPEC   virtual result do_unshift(mbstate_t&   __state,
   1.421 -                            char*  __to, 
   1.422 +  _STLP_DECLSPEC virtual result do_unshift(mbstate_t&   __state,
   1.423 +                            char*  __to,
   1.424                              char*  __to_limit,
   1.425                              char*& __to_next) const;
   1.426  
   1.427 -  _STLP_DECLSPEC   virtual int do_encoding() const _STLP_NOTHROW;
   1.428 +  _STLP_DECLSPEC virtual int do_encoding() const _STLP_NOTHROW;
   1.429  
   1.430 -  _STLP_DECLSPEC   virtual bool do_always_noconv() const _STLP_NOTHROW;
   1.431 -  
   1.432 -  _STLP_DECLSPEC   virtual int do_length(const mbstate_t& __state,
   1.433 -                        const  char* __from, 
   1.434 +  _STLP_DECLSPEC virtual bool do_always_noconv() const _STLP_NOTHROW;
   1.435 +
   1.436 +  _STLP_DECLSPEC virtual int do_length(const mbstate_t& __state,
   1.437 +                        const  char* __from,
   1.438                          const  char* __end,
   1.439                          size_t __max) const;
   1.440  
   1.441 -  _STLP_DECLSPEC   virtual int do_max_length() const _STLP_NOTHROW;
   1.442 +  _STLP_DECLSPEC virtual int do_max_length() const _STLP_NOTHROW;
   1.443  
   1.444  private:
   1.445    codecvt(const codecvt<wchar_t, char, mbstate_t>&);
   1.446 -  codecvt<wchar_t, char, mbstate_t>& operator = (const codecvt<wchar_t, char, mbstate_t>&);  
   1.447 +  codecvt<wchar_t, char, mbstate_t>& operator = (const codecvt<wchar_t, char, mbstate_t>&);
   1.448  };
   1.449  
   1.450  # endif
   1.451 @@ -255,25 +383,25 @@
   1.452  class _STLP_CLASS_DECLSPEC codecvt_byname<char, char, mbstate_t>
   1.453    : public codecvt<char, char, mbstate_t> {
   1.454  public:
   1.455 -  explicit _STLP_DECLSPEC codecvt_byname(const char* __name, size_t __refs = 0);
   1.456 -  ~codecvt_byname();
   1.457 +  _STLP_DECLSPEC explicit codecvt_byname(const char* __name, size_t __refs = 0);
   1.458 +  _STLP_DECLSPEC ~codecvt_byname();
   1.459  private:
   1.460    codecvt_byname(const codecvt_byname<char, char, mbstate_t>&);
   1.461 -  codecvt_byname<char, char, mbstate_t>& operator =(const codecvt_byname<char, char, mbstate_t>&);  
   1.462 +  codecvt_byname<char, char, mbstate_t>& operator =(const codecvt_byname<char, char, mbstate_t>&);
   1.463  };
   1.464  
   1.465  # ifndef _STLP_NO_WCHAR_T
   1.466  _STLP_TEMPLATE_NULL
   1.467 -class codecvt_byname<wchar_t, char, mbstate_t>
   1.468 -  : public codecvt<wchar_t, char, mbstate_t> 
   1.469 +class _STLP_CLASS_DECLSPEC codecvt_byname<wchar_t, char, mbstate_t>
   1.470 +  : public codecvt<wchar_t, char, mbstate_t>
   1.471  {
   1.472  public:
   1.473 -  explicit _STLP_DECLSPEC codecvt_byname(const char * __name, size_t __refs = 0);    
   1.474 +  _STLP_DECLSPEC explicit codecvt_byname(const char * __name, size_t __refs = 0, _Locale_name_hint* __hint = 0);
   1.475  
   1.476  protected:
   1.477 -    _STLP_DECLSPEC ~codecvt_byname();
   1.478 +  _STLP_DECLSPEC ~codecvt_byname();
   1.479  
   1.480 -  _STLP_DECLSPEC   virtual result do_out(mbstate_t&         __state,
   1.481 +  _STLP_DECLSPEC virtual result do_out(mbstate_t&         __state,
   1.482                          const wchar_t*  __from,
   1.483                          const wchar_t*  __from_end,
   1.484                          const wchar_t*& __from_next,
   1.485 @@ -281,7 +409,7 @@
   1.486                          char*        __to_limit,
   1.487                          char*&       __to_next) const;
   1.488  
   1.489 -  _STLP_DECLSPEC   virtual result do_in (mbstate_t&         __state,
   1.490 +  _STLP_DECLSPEC virtual result do_in (mbstate_t&         __state,
   1.491                          const char*  __from,
   1.492                          const char*  __from_end,
   1.493                          const char*& __from_next,
   1.494 @@ -289,26 +417,26 @@
   1.495                          wchar_t*        __to_limit,
   1.496                          wchar_t*&       __to_next) const;
   1.497  
   1.498 -  _STLP_DECLSPEC   virtual result do_unshift(mbstate_t&   __state,
   1.499 -                            char*  __to, 
   1.500 +  _STLP_DECLSPEC virtual result do_unshift(mbstate_t&   __state,
   1.501 +                            char*  __to,
   1.502                              char*  __to_limit,
   1.503                              char*& __to_next) const;
   1.504  
   1.505 -  _STLP_DECLSPEC   virtual int do_encoding() const _STLP_NOTHROW;
   1.506 +  _STLP_DECLSPEC virtual int do_encoding() const _STLP_NOTHROW;
   1.507  
   1.508 -  _STLP_DECLSPEC   virtual bool do_always_noconv() const _STLP_NOTHROW;
   1.509 -  
   1.510 -  _STLP_DECLSPEC   virtual int do_length(const mbstate_t&         __state,
   1.511 -                        const  char* __from, 
   1.512 +  _STLP_DECLSPEC virtual bool do_always_noconv() const _STLP_NOTHROW;
   1.513 +
   1.514 +  _STLP_DECLSPEC virtual int do_length(const mbstate_t&         __state,
   1.515 +                        const  char* __from,
   1.516                          const  char* __end,
   1.517                          size_t __max) const;
   1.518  
   1.519 -  _STLP_DECLSPEC   virtual int do_max_length() const _STLP_NOTHROW;
   1.520 +  _STLP_DECLSPEC virtual int do_max_length() const _STLP_NOTHROW;
   1.521  
   1.522  private:
   1.523    _Locale_ctype* _M_ctype;
   1.524    codecvt_byname(const codecvt_byname<wchar_t, char, mbstate_t>&);
   1.525 -  codecvt_byname<wchar_t, char, mbstate_t>& operator =(const codecvt_byname<wchar_t, char, mbstate_t>&);  
   1.526 +  codecvt_byname<wchar_t, char, mbstate_t>& operator =(const codecvt_byname<wchar_t, char, mbstate_t>&);
   1.527  };
   1.528  
   1.529  # endif