epoc32/include/stdapis/stlportv5/stl/_num_get.h
branchSymbian3
changeset 4 837f303aceeb
parent 3 e1b950c65cb4
     1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_num_get.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_num_get.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,21 +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,18 +26,23 @@
    1.31  #define _STLP_INTERNAL_NUM_GET_H
    1.32  
    1.33  #ifndef _STLP_INTERNAL_ISTREAMBUF_ITERATOR_H
    1.34 -# include <stl/_istreambuf_iterator.h>
    1.35 +#  include <stl/_istreambuf_iterator.h>
    1.36  #endif
    1.37  
    1.38 -# ifndef _STLP_C_LOCALE_H
    1.39 +#ifndef _STLP_C_LOCALE_H
    1.40  #  include <stl/c_locale.h>
    1.41 -# endif
    1.42 +#endif
    1.43  
    1.44  #ifndef _STLP_INTERNAL_NUMPUNCT_H
    1.45 -# include <stl/_numpunct.h>
    1.46 +#  include <stl/_numpunct.h>
    1.47  #endif
    1.48 +
    1.49  #ifndef _STLP_INTERNAL_CTYPE_H
    1.50 -# include <stl/_ctype.h>
    1.51 +#  include <stl/_ctype.h>
    1.52 +#endif
    1.53 +
    1.54 +#ifndef _STLP_INTERNAL_IOSTREAM_STRING_H
    1.55 +#  include <stl/_iostream_string.h>
    1.56  #endif
    1.57  
    1.58  _STLP_BEGIN_NAMESPACE
    1.59 @@ -44,269 +50,195 @@
    1.60  //----------------------------------------------------------------------
    1.61  // num_get facets
    1.62  
    1.63 -# ifdef _STLP_LIMITED_DEFAULT_TEMPLATES
    1.64 -template <class _CharT, class _InputIter>  
    1.65 -# else
    1.66 -template <class _CharT, class _InputIter = istreambuf_iterator<_CharT> >  
    1.67 -# endif
    1.68 -#ifdef __SYMBIAN32__
    1.69 -class num_get : public locale::facet
    1.70 +#if defined (_STLP_LIMITED_DEFAULT_TEMPLATES)
    1.71 +template <class _CharT, class _InputIter>
    1.72  #else
    1.73 -class num_get: public locale::facet
    1.74 +template <class _CharT, class _InputIter = istreambuf_iterator<_CharT, char_traits<_CharT> > >
    1.75  #endif
    1.76 -{
    1.77 -  friend class _Locale;
    1.78 +class num_get: public locale::facet {
    1.79 +  friend class _Locale_impl;
    1.80  public:
    1.81    typedef _CharT     char_type;
    1.82    typedef _InputIter iter_type;
    1.83  
    1.84 -  explicit   num_get(size_t __refs = 0): locale::facet(__refs) {}
    1.85 -    
    1.86 -# ifndef _STLP_NO_BOOL
    1.87 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
    1.88 -                ios_base::iostate& __err, bool& __val) const {
    1.89 -    return do_get(__stl_in, __end, __str, __err, __val);
    1.90 -  }
    1.91 +  explicit num_get(size_t __refs = 0): locale::facet(__refs) {}
    1.92 +
    1.93 +#if !defined (_STLP_NO_BOOL)
    1.94 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
    1.95 +                 ios_base::iostate& __err, bool& __val) const
    1.96 +  { return do_get(__ii, __end, __str, __err, __val); }
    1.97 +#endif
    1.98 +
    1.99 +#if defined (_STLP_FIX_LIBRARY_ISSUES)
   1.100 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.101 +                 ios_base::iostate& __err, short& __val) const
   1.102 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.103 +
   1.104 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.105 +                 ios_base::iostate& __err, int& __val) const
   1.106 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.107 +#endif
   1.108 +
   1.109 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.110 +                 ios_base::iostate& __err, long& __val) const
   1.111 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.112 +
   1.113 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.114 +                 ios_base::iostate& __err, unsigned short& __val) const
   1.115 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.116 +
   1.117 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.118 +                 ios_base::iostate& __err, unsigned int& __val) const
   1.119 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.120 +
   1.121 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.122 +                 ios_base::iostate& __err, unsigned long& __val) const
   1.123 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.124 +
   1.125 +#if defined (_STLP_LONG_LONG)
   1.126 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.127 +                 ios_base::iostate& __err, _STLP_LONG_LONG& __val) const
   1.128 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.129 +
   1.130 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.131 +                 ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const
   1.132 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.133 +#endif /* _STLP_LONG_LONG */
   1.134 +
   1.135 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.136 +                 ios_base::iostate& __err, float& __val) const
   1.137 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.138 +
   1.139 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.140 +                 ios_base::iostate& __err, double& __val) const
   1.141 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.142 +
   1.143 +#if !defined (_STLP_NO_LONG_DOUBLE)
   1.144 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.145 +                 ios_base::iostate& __err, long double& __val) const
   1.146 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.147  # endif
   1.148  
   1.149 -//# ifdef _STLP_FIX_LIBRARY_ISSUES
   1.150 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.151 -                ios_base::iostate& __err, short& __val) const {
   1.152 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.153 -  }
   1.154 +  _InputIter get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.155 +                 ios_base::iostate& __err, void*& __val) const
   1.156 +  { return do_get(__ii, __end, __str, __err, __val); }
   1.157  
   1.158 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.159 -                ios_base::iostate& __err, int& __val) const {
   1.160 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.161 -  }
   1.162 -//# endif
   1.163 -
   1.164 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.165 -                ios_base::iostate& __err, long& __val) const {
   1.166 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.167 -  }
   1.168 -
   1.169 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.170 -                ios_base::iostate& __err, unsigned short& __val) const {
   1.171 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.172 -  }
   1.173 -
   1.174 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.175 -                ios_base::iostate& __err, unsigned int& __val) const {
   1.176 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.177 -  }
   1.178 -
   1.179 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.180 -                ios_base::iostate& __err, unsigned long& __val) const {
   1.181 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.182 -  }
   1.183 -
   1.184 -#ifdef _STLP_LONG_LONG
   1.185 -
   1.186 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.187 -                ios_base::iostate& __err, _STLP_LONG_LONG& __val) const {
   1.188 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.189 -  }
   1.190 -
   1.191 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.192 -                ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const {
   1.193 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.194 -  }
   1.195 -
   1.196 -#endif /* _STLP_LONG_LONG */
   1.197 -
   1.198 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.199 -                 ios_base::iostate& __err, float& __val) const {
   1.200 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.201 -  }
   1.202 -
   1.203 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.204 -                ios_base::iostate& __err, double& __val) const {
   1.205 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.206 -  }
   1.207 -
   1.208 -# ifndef _STLP_NO_LONG_DOUBLE
   1.209 -
   1.210 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.211 -                ios_base::iostate& __err, long double& __val) const {
   1.212 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.213 -  }
   1.214 -# endif
   1.215 -
   1.216 -  _InputIter get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.217 -                ios_base::iostate& __err, void*& __val) const {
   1.218 -    return do_get(__stl_in, __end, __str, __err, __val);
   1.219 -  }
   1.220 -
   1.221 -#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
   1.222 -    _STLP_STATIC_MEMBER_DECLSPEC static locale::id& GetFacetLocaleId();
   1.223 -    _STLP_STATIC_MEMBER_DECLSPEC static locale::id& GetFacetLocaleId(istreambuf_iterator<wchar_t, char_traits<wchar_t> >* );
   1.224 -    _STLP_STATIC_MEMBER_DECLSPEC static locale::id& GetFacetLocaleId(const wchar_t**);
   1.225 -    _STLP_STATIC_MEMBER_DECLSPEC static locale::id& GetFacetLocaleId(istreambuf_iterator<char, char_traits<char> >* );
   1.226 -    _STLP_STATIC_MEMBER_DECLSPEC static locale::id& GetFacetLocaleId(const char**);
   1.227 -    
   1.228 +#if defined(__SYMBIAN32__WSD__) 
   1.229 +  static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId();
   1.230 +#elif defined (__SYMBIAN32__NO_STATIC_IMPORTS__)    
   1.231 +  static _STLP_STATIC_MEMBER_DECLSPEC locale::id& GetFacetLocaleId();
   1.232 +  static locale::id id;       
   1.233  #else
   1.234 -    _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
   1.235 +  // NOTE: Symbian doesn't support exporting static data.  
   1.236 +  // Users of this class should use GetFacetLocaleId() to access the data member id  
   1.237 +  static _STLP_STATIC_MEMBER_DECLSPEC locale::id id;
   1.238  #endif
   1.239  
   1.240  protected:
   1.241    ~num_get() {}
   1.242  
   1.243 -  typedef string               string_type; 
   1.244 +  typedef string               string_type;
   1.245    typedef ctype<_CharT>        _Ctype;
   1.246    typedef numpunct<_CharT>     _Numpunct;
   1.247  
   1.248 -# ifndef _STLP_NO_BOOL
   1.249 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end,
   1.250 -                           ios_base& __str, ios_base::iostate& __err, bool& __val) const;
   1.251 -# endif
   1.252 +#if !defined (_STLP_NO_BOOL)
   1.253 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.254 +                            ios_base::iostate& __err, bool& __val) const;
   1.255 +#endif
   1.256  
   1.257 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.258 -                           ios_base::iostate& __err, long& __val) const;
   1.259 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.260 -                           ios_base::iostate& __err, unsigned short& __val) const;
   1.261 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.262 -                           ios_base::iostate& __err, unsigned int& __val) const;
   1.263 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.264 -                           ios_base::iostate& __err, unsigned long& __val) const;
   1.265 -//# ifdef _STLP_FIX_LIBRARY_ISSUES
   1.266 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.267 +                            ios_base::iostate& __err, long& __val) const;
   1.268 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.269 +                            ios_base::iostate& __err, unsigned short& __val) const;
   1.270 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.271 +                            ios_base::iostate& __err, unsigned int& __val) const;
   1.272 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.273 +                            ios_base::iostate& __err, unsigned long& __val) const;
   1.274 +
   1.275 +#if defined (_STLP_FIX_LIBRARY_ISSUES)
   1.276    // issue 118 : those are actually not supposed to be here
   1.277 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.278 -                           ios_base::iostate& __err, short& __val) const;
   1.279 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.280 -                           ios_base::iostate& __err, int& __val) const;
   1.281 -//# endif
   1.282 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.283 -                          ios_base::iostate& __err, float& __val) const;
   1.284 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.285 -                           ios_base::iostate& __err, double& __val) const;
   1.286 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.287 -                           ios_base::iostate& __err,
   1.288 -                           void*& __p) const;
   1.289 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.290 +                            ios_base::iostate& __err, short& __val) const;
   1.291 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.292 +                            ios_base::iostate& __err, int& __val) const;
   1.293 +#endif
   1.294  
   1.295 -#ifndef _STLP_NO_LONG_DOUBLE
   1.296 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.297 -                           ios_base::iostate& __err, long double& __val) const;
   1.298 -#endif /* _STLP_NO_LONG_DOUBLE */
   1.299 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.300 +                            ios_base::iostate& __err, float& __val) const;
   1.301 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.302 +                            ios_base::iostate& __err, double& __val) const;
   1.303 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.304 +                            ios_base::iostate& __err, void*& __p) const;
   1.305  
   1.306 -#ifdef _STLP_LONG_LONG
   1.307 +#if !defined (_STLP_NO_LONG_DOUBLE)
   1.308 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.309 +                            ios_base::iostate& __err, long double& __val) const;
   1.310 +#endif
   1.311  
   1.312 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.313 +#if defined (_STLP_LONG_LONG)
   1.314 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.315                              ios_base::iostate& __err, _STLP_LONG_LONG& __val) const;
   1.316 -  virtual _InputIter do_get(_InputIter __stl_in, _InputIter __end, ios_base& __str,
   1.317 -                           ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const;
   1.318 -#endif /* _STLP_LONG_LONG */
   1.319 +  virtual _InputIter do_get(_InputIter __ii, _InputIter __end, ios_base& __str,
   1.320 +                            ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const;
   1.321 +#endif
   1.322  
   1.323  };
   1.324  
   1.325  
   1.326 -# ifdef _STLP_USE_TEMPLATE_EXPORT
   1.327 +#if defined (_STLP_USE_TEMPLATE_EXPORT)
   1.328  _STLP_EXPORT_TEMPLATE_CLASS num_get<char, istreambuf_iterator<char, char_traits<char> > >;
   1.329  // _STLP_EXPORT_TEMPLATE_CLASS num_get<char, const char*>;
   1.330 -#  ifndef _STLP_NO_WCHAR_T
   1.331 +#  if !defined (_STLP_NO_WCHAR_T)
   1.332  _STLP_EXPORT_TEMPLATE_CLASS num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
   1.333  // _STLP_EXPORT_TEMPLATE_CLASS num_get<wchar_t, const wchar_t*>;
   1.334 -#  endif /* _STLP_NO_WCHAR_T */
   1.335 -# endif
   1.336 +#  endif
   1.337 +#endif
   1.338  
   1.339 -# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
   1.340 +#if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
   1.341  
   1.342 -_STLP_DECLSPEC extern bool  _STLP_CALL __valid_grouping(const char*, const char*, const char*, const char*);
   1.343 +_STLP_MOVE_TO_PRIV_NAMESPACE
   1.344  
   1.345 -template <class _InputIter, class _Integer>
   1.346 +_STLP_DECLSPEC bool _STLP_CALL __valid_grouping(const char*, const char*, const char*, const char*);
   1.347 +
   1.348 +template <class _InputIter, class _Integer, class _CharT>
   1.349  bool _STLP_CALL
   1.350 -__get_decimal_integer(_InputIter& __first, _InputIter& __last, _Integer& __val);
   1.351 +__get_decimal_integer(_InputIter& __first, _InputIter& __last, _Integer& __val, _CharT*);
   1.352  
   1.353 -inline bool _STLP_CALL __get_fdigit(char& __c, const char*);
   1.354 -inline bool _STLP_CALL __get_fdigit_or_sep(char& __c, char __sep, const char *);
   1.355 -# ifndef _STLP_NO_WCHAR_T
   1.356 -inline bool _STLP_CALL __get_fdigit(wchar_t&, const wchar_t*);
   1.357 -inline bool _STLP_CALL __get_fdigit_or_sep(wchar_t&, wchar_t, const wchar_t*);
   1.358 -# endif
   1.359 +#  if !defined (_STLP_NO_WCHAR_T)
   1.360 +bool _STLP_DECLSPEC _STLP_CALL __get_fdigit(wchar_t&, const wchar_t*);
   1.361 +bool _STLP_DECLSPEC _STLP_CALL __get_fdigit_or_sep(wchar_t&, wchar_t, const wchar_t*);
   1.362 +#  endif
   1.363  
   1.364  inline void  _STLP_CALL
   1.365  _Initialize_get_float(const ctype<char>&,
   1.366                         char& Plus, char& Minus,
   1.367                         char& pow_e, char& pow_E,
   1.368 -                       char*)
   1.369 -{
   1.370 +                       char*) {
   1.371    Plus = '+';
   1.372    Minus = '-';
   1.373    pow_e = 'e';
   1.374    pow_E = 'E';
   1.375  }
   1.376 -// Helper functions for _M_do_get_float.
   1.377  
   1.378 -# ifndef _STLP_NO_WCHAR_T
   1.379 +#  if !defined (_STLP_NO_WCHAR_T)
   1.380 +void _STLP_DECLSPEC _STLP_CALL _Initialize_get_float(const ctype<wchar_t>&,
   1.381 +                                                     wchar_t&, wchar_t&, wchar_t&, wchar_t&, wchar_t*);
   1.382 +#  endif
   1.383 +void _STLP_DECLSPEC _STLP_CALL __string_to_float(const __iostring&, float&);
   1.384 +void _STLP_DECLSPEC _STLP_CALL __string_to_float(const __iostring&, double&);
   1.385 +#  if !defined (_STLP_NO_LONG_DOUBLE)
   1.386 +void _STLP_DECLSPEC _STLP_CALL __string_to_float(const __iostring&, long double&);
   1.387 +#  endif
   1.388  
   1.389 -inline void  _STLP_CALL
   1.390 -_Initialize_get_float( const ctype<wchar_t>& ct,
   1.391 -                       wchar_t& Plus, wchar_t& Minus,
   1.392 -                       wchar_t& pow_e, wchar_t& pow_E,
   1.393 -                       wchar_t* digits)
   1.394 -{
   1.395 -  char ndigits[11] = "0123456789";
   1.396 -  Plus  = ct.widen('+');
   1.397 -  Minus = ct.widen('-');
   1.398 -  pow_e = ct.widen('e');
   1.399 -  pow_E = ct.widen('E');
   1.400 -  ct.widen(ndigits + 0, ndigits + 10, digits);
   1.401 -}
   1.402 +_STLP_MOVE_TO_STD_NAMESPACE
   1.403  
   1.404 -# endif /* WCHAR_T */
   1.405 +#endif /* _STLP_EXPOSE_STREAM_IMPLEMENTATION */
   1.406  
   1.407 -#ifdef __SYMBIAN32__
   1.408 -template<class _CharT>
   1.409 -inline void  _STLP_CALL
   1.410 -_Initialize_get_float( const ctype<_CharT>& ct,
   1.411 -                       _CharT& Plus, _CharT& Minus,
   1.412 -                       _CharT& pow_e, _CharT& pow_E,
   1.413 -                       _CharT* digits)
   1.414 -{
   1.415 -  char ndigits[11] = "0123456789";
   1.416 -  Plus  = ct.widen('+');
   1.417 -  Minus = ct.widen('-');
   1.418 -  pow_e = ct.widen('e');
   1.419 -  pow_E = ct.widen('E');
   1.420 -  ct.widen(ndigits + 0, ndigits + 10, digits);
   1.421 -}
   1.422 -#endif
   1.423 -
   1.424 -int  _STLP_CALL __string_to_float(const string&, float&);
   1.425 -int  _STLP_CALL __string_to_float(const string&, double&);
   1.426 -# ifndef _STLP_NO_LONG_DOUBLE
   1.427 -int  _STLP_CALL __string_to_float(const string&, long double&);
   1.428 -# endif
   1.429 -# endif
   1.430 -
   1.431 -# if defined (__BORLANDC__) && defined (_RTLDLL)
   1.432 -inline void _Stl_loc_init_num_get() {  
   1.433 -#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
   1.434 -  num_get<char, istreambuf_iterator<char, char_traits<char> > >::GetFacetLocaleId()._M_index = 12;
   1.435 -  num_get<char, const char*>::GetFacetLocaleId()._M_index = 13;
   1.436 -#else
   1.437 -  num_get<char, istreambuf_iterator<char, char_traits<char> > >::id._M_index = 12;
   1.438 -  num_get<char, const char*>::id._M_index = 13;
   1.439 -#endif
   1.440 -# ifndef _STLP_NO_WCHAR_T
   1.441 -#if defined(__LIBSTD_CPP_SYMBIAN32_WSD__) || defined(_STLP_LIBSTD_CPP_NO_STATIC_VAR_)
   1.442 -  num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::GetFacetLocaleId()._M_index = 31;
   1.443 -  num_get<wchar_t, const wchar_t*>::GetFacetLocaleId()._M_index = 32;
   1.444 -#else
   1.445 -  num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id._M_index = 31;
   1.446 -  num_get<wchar_t, const wchar_t*>::id._M_index = 32;
   1.447 -#endif
   1.448 -# endif
   1.449 -} 
   1.450 -# endif
   1.451 -
   1.452 -_STLP_DECLSPEC unsigned char* _STLP_CALL __get_digit_val_table(void);
   1.453 -_STLP_DECLSPEC char* _STLP_CALL __get_narrow_atoms(void);
   1.454  _STLP_END_NAMESPACE
   1.455  
   1.456 -#  if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && ! defined (_STLP_LINK_TIME_INSTANTIATION)
   1.457 -#   include <stl/_num_get.c>
   1.458 -#  endif
   1.459 +#if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION)
   1.460 +#  include <stl/_num_get.c>
   1.461 +#endif
   1.462  
   1.463  #endif /* _STLP_INTERNAL_NUM_GET_H */
   1.464