+2000-12-22 Benjamin Kosnik <bkoz@fillmore.redhat.com>
+
+ Attempt to make locale visible in gdb.
+ * include/bits/std_locale.h: Remove codecvt.h include.
+ * include/bits/locale_facets.h: Add here, after ctype decls.
+ * include/bits/codecvt.h: Remove std namespace, as assumed to be
+ in std now.
+
+ * include/bits/locale_facets.h: Consistently move generic static
+ member definitions directly after generic facet declarations.
+ * include/bits/locale_facets.tcc: From here.
+
+ * src/locale.cc: Organize locale::id static definitions for
+ required facets.
+ * src/codecvt.cc (codecvt<char...>): Remove locale::id definition.
+ (codecvt<wchar_t...>): Same.
+ * src/localename: And here.
+
+ * include/bits/localefwd.h (_Count_ones): Change _S_count to _M_count.
+ Same for _M_halfcount.
+ (std): make locale::_Impl protected. CHANGE BACK
+
2000-12-22 Alexandre Oliva <aoliva@redhat.com>
* mknumeric_limits: Output to temporary files, and rename them at
#ifndef _CPP_BITS_CODECVT_H
#define _CPP_BITS_CODECVT_H 1
-#include <bits/c++config.h>
-#ifdef _GLIBCPP_USE_WCHAR_T
-#include <iconv.h> // For iconv, iconv_t
-#include <langinfo.h>
-#endif
-
-namespace std
-{
// XXX
// __enc_traits may need to move up the locale header hierarchy,
// depending on if ctype ends up using it.
virtual
~codecvt_byname() { }
};
-} // namespace std
#endif // _CPP_BITS_CODECVT_H
#include <bits/std_ios.h> // For ios_base
#ifdef _GLIBCPP_USE_WCHAR_T
# include <bits/std_cwctype.h> // For wctype_t
+# include <iconv.h> // For codecvt using iconv, iconv_t
+# include <langinfo.h> // For codecvt using nl_langinfo
#endif
namespace std
_Use_facet_failure_handler(const locale&)
{ throw _Bad_use_facet(); }
- // 22.2.1 The ctype category
+ // 22.2.1.1 Template class ctype
// Include host-specific ctype enums for ctype_base.
#include <bits/ctype_base.h>
- // 22.2.1.1 Template class ctype
// __ctype_abstract_base is the common base for ctype<_CharT>.
template<typename _CharT>
class __ctype_abstract_base : public locale::facet, public ctype_base
~ctype() { }
};
+ template<typename _CharT>
+ locale::id ctype<_CharT>::id;
+
// 22.2.1.3 ctype specializations
template<>
class ctype<char> : public __ctype_abstract_base<char>
ctype_byname<char>::ctype_byname(const char*, size_t refs);
+ // 22.2.1.5 Template class codecvt
+ #include <bits/codecvt.h>
+
template<typename _CharT, typename _InIter>
class _Numeric_get; // forward
_S_callback(ios_base::event __event, ios_base& __ios, int __ix) throw();
};
+ template<typename _CharT>
+ int _Format_cache<_CharT>::_S_pword_ix;
+
+ template<typename _CharT>
+ const char _Format_cache<_CharT>::
+ _S_literals[] = "-+xX0123456789abcdef0123456789ABCDEF";
+
template<> _Format_cache<char>::_Format_cache();
#ifdef _GLIBCPP_USE_WCHAR_T
template<> _Format_cache<wchar_t>::_Format_cache();
void*&) const;
};
+ template<typename _CharT, typename _InIter>
+ locale::id num_get<_CharT, _InIter>::id;
+
// Declare specialized extraction member function.
template<>
void
do_put(iter_type, ios_base&, char_type __fill, const void* __v) const;
};
+ template <typename _CharT, typename _OutIter>
+ locale::id num_put<_CharT, _OutIter>::id;
+
template<typename _CharT>
class _Punct : public locale::facet
{
_M_thousands_sep = __t;
_M_grouping = __g;
}
-
};
template<typename _CharT>
_M_truename = __t;
_M_falsename = __f;
}
-
};
template<typename _CharT>
explicit
numpunct(size_t __refs = 0) : _Numpunct<_CharT>(__refs) { }
- protected:
+ protected:
virtual
~numpunct() { }
};
+ template<typename _CharT>
+ locale::id numpunct<_CharT>::id;
+
template<>
numpunct<char>::numpunct(size_t __refs): _Numpunct<char>(__refs)
{
~collate() { }
};
+ template<typename _CharT>
+ locale::id collate<_CharT>::id;
+
template<>
class collate<char> : public _Collate<char>
{
mutable basic_string<_CharT>* _M_monthnames;
};
+ template<typename _CharT, typename _InIter>
+ locale::id time_get<_CharT, _InIter>::id;
+
template<typename _CharT, typename _InIter>
class time_get_byname : public time_get<_CharT, _InIter>
{
{ return __s; }
};
+ template<typename _CharT, typename _OutIter>
+ locale::id time_put<_CharT, _OutIter>::id;
+
template<typename _CharT, typename _OutIter>
class time_put_byname : public time_put<_CharT, _OutIter>
{
{ return __s; }
};
+ template<typename _CharT, typename _InIter>
+ locale::id money_get<_CharT, _InIter>::id;
+
template<typename _CharT, typename _OutIter>
class money_put : public locale::facet
{
{ return __s; }
};
+ template<typename _CharT, typename _OutIter>
+ locale::id money_put<_CharT, _OutIter>::id;
+
struct money_base
{
enum part { none, space, symbol, sign, value };
~moneypunct() { }
};
+ template<typename _CharT, bool _Intl>
+ locale::id moneypunct<_CharT, _Intl>::id;
+
+ template<typename _CharT, bool _Intl>
+ const bool moneypunct<_CharT, _Intl>::intl;
+
template<typename _CharT, bool _Intl>
class moneypunct_byname : public moneypunct<_CharT,_Intl>
{
~moneypunct_byname() { }
};
+ template<typename _CharT, bool _Intl>
+ const bool moneypunct_byname<_CharT, _Intl>::intl;
+
template<>
moneypunct_byname<char, false>::
moneypunct_byname(const char*, size_t __refs);
~messages() { }
};
+ template<typename _CharT>
+ locale::id messages<_CharT>::id;
+
template<typename _CharT>
class messages_byname : public messages<_CharT>
{
inline _CharT
tolower(_CharT __c, const locale& __loc)
{ return use_facet<ctype<_CharT> >(__loc).tolower(__c); }
-
} // namespace std
#endif /* _CPP_BITS_LOCFACETS_H */
// Local Variables:
// mode:c++
// End:
-
return __s;
}
- template<typename _CharT>
- locale::id ctype<_CharT>::id;
-
- template<typename _CharT>
- int _Format_cache<_CharT>::_S_pword_ix;
-
- template<typename _CharT>
- const char _Format_cache<_CharT>::
- _S_literals[] = "-+xX0123456789abcdef0123456789ABCDEF";
-
template<typename _CharT>
_Format_cache<_CharT>::_Format_cache()
: _M_valid(true), _M_use_grouping(false)
return __ncp;
}
- template<typename _CharT, typename _InIter>
- locale::id num_get<_CharT, _InIter>::id;
-
// This member function takes an (w)istreambuf_iterator object and
// parses it into a generic char array suitable for parsing with
// strto[l,ll,f,d]. The thought was to encapsulate the conversion
return __beg;
}
- template <typename _CharT, typename _OutIter>
- locale::id num_put<_CharT, _OutIter>::id;
-
// _S_fill is specialized for ostreambuf_iterator, random access iterator.
template <typename _CharT, typename _OutIter>
inline _OutIter
}
}
- template<typename _CharT>
- locale::id numpunct<_CharT>::id;
-
- template<typename _CharT>
- locale::id collate<_CharT>::id;
-
// Support for time_get:
// Note that these partial specializations could, and maybe should,
// be changed to full specializations (by eliminating the _Dummy
};
#endif
- template<typename _CharT, typename _InIter>
- locale::id time_get<_CharT, _InIter>::id;
-
template<typename _CharT, typename _InIter>
_InIter
time_get<_CharT, _InIter>::
__err |= __io.failbit;
return __out;
}
-
- template<typename _CharT, typename _OutIter>
- locale::id time_put<_CharT, _OutIter>::id;
-
- template<typename _CharT, typename _InIter>
- locale::id money_get<_CharT, _InIter>::id;
-
- template<typename _CharT, typename _OutIter>
- locale::id money_put<_CharT, _OutIter>::id;
-
- template<typename _CharT, bool _Intl>
- locale::id moneypunct<_CharT, _Intl>::id;
-
- template<typename _CharT, bool _Intl>
- const bool moneypunct<_CharT, _Intl>::intl;
-
- template<typename _CharT, bool _Intl>
- const bool moneypunct_byname<_CharT, _Intl>::intl;
-
- template<typename _CharT>
- locale::id messages<_CharT>::id;
} // std::
#endif /* _CPP_BITS_LOCFACETS_TCC */
{
enum
{
- _S_count = _Num
+ _M_count = _Num
};
};
{
enum
{
- _S_halfcount = _Count_ones<_Num, _Shift/2,
- (_Mask^((~_Mask)>>(_Shift/2))) >::_S_count,
- _S_count = (_S_halfcount&_Mask) + ((_S_halfcount>>_Shift)&_Mask)
+ _M_halfcount = _Count_ones<_Num, _Shift/2,
+ (_Mask^((~_Mask)>>(_Shift/2))) >::_M_count,
+ _M_count = (_M_halfcount&_Mask) + ((_M_halfcount>>_Shift)&_Mask)
};
};
#ifdef _GLIBCPP_USE_WCHAR_T
template<> class ctype<wchar_t>;
#endif
-
template<typename _CharT>
class ctype_byname;
// NB: Specialized for char and wchar_t in locale_facets.h.
#ifdef _GLIBCPP_USE_WCHAR_T
template<> class codecvt<wchar_t, char, mbstate_t>;
#endif
-
template<typename _InternT, typename _ExternT, typename _StateT>
class codecvt_byname;
{
public:
// Types:
- typedef int category;
+ typedef unsigned int category;
// Forward decls and friends:
class facet;
// Category values:
// NB much depends on the order in which these appear:
static const category none = 0;
- static const category collate = 0x0100;
- static const category ctype = 0x0200;
- static const category monetary = 0x0400;
- static const category numeric = 0x0800;
- static const category time = 0x1000;
- static const category messages = 0x2000;
+ static const category ctype = 1 << 0;
+ static const category numeric = 1 << 1;
+ static const category collate = 1 << 2;
+ static const category time = 1 << 3;
+ static const category monetary = 1 << 4;
+ static const category messages = 1 << 5;
static const category all = (collate | ctype | monetary |
numeric | time | messages);
// Current global reference locale
static _Impl* _S_global;
- static const int _S_categories_num = _Count_ones<all>::_S_count;
+ static const int _S_categories_num = _Count_ones<all>::_M_count;
static const int _S_facets_num = 26;
explicit
friend bool
has_facet(const locale&) throw();
- private:
+ // private:
+ protected:
// Data Members.
size_t _M_references;
__vec_facet* _M_facets;
__vec_string* _M_category_names;
bool _M_has_name;
string _M_name;
- static const locale::id* const _S_id_collate[];
static const locale::id* const _S_id_ctype[];
- static const locale::id* const _S_id_monetary[];
static const locale::id* const _S_id_numeric[];
+ static const locale::id* const _S_id_collate[];
static const locale::id* const _S_id_time[];
+ static const locale::id* const _S_id_monetary[];
static const locale::id* const _S_id_messages[];
static const locale::id* const* const _S_facet_categories[];
friend bool
has_facet(const locale&) throw ();
public:
- id() {};
+ id() { };
private:
// NB: There is no accessor for _M_index because it may be used
// before the constructor is run; the effect of calling a member
#include <bits/localefwd.h>
#include <bits/locale_facets.h>
#include <bits/locale_facets.tcc>
-#include <bits/codecvt.h>
#endif
const int __enc_traits::_S_max_size;
#endif /* _GLIBCPP_USE_WCHAR_T */
- // codecvt<char, char, mbstate_t> required specialization
- locale::id codecvt<char, char, mbstate_t>::id;
-
codecvt<char, char, mbstate_t>::
codecvt(size_t __refs)
: __codecvt_abstract_base<char, char, mbstate_t>(__refs)
#ifdef _GLIBCPP_USE_WCHAR_T
// codecvt<wchar_t, char, mbstate_t> required specialization
- locale::id codecvt<wchar_t, char, mbstate_t>::id;
-
codecvt<wchar_t, char, mbstate_t>::
codecvt(size_t __refs)
: __codecvt_abstract_base<wchar_t, char, mbstate_t>(__refs) { }
# include <bits/std_cwctype.h> // for towupper, etc.
#endif
-namespace std {
-
+namespace std
+{
// Definitions for static const data members of locale.
const locale::category locale::none;
- const locale::category locale::collate;
const locale::category locale::ctype;
- const locale::category locale::monetary;
const locale::category locale::numeric;
+ const locale::category locale::collate;
const locale::category locale::time;
+ const locale::category locale::monetary;
const locale::category locale::messages;
const locale::category locale::all;
const int locale::_S_categories_num;
const int locale::_S_facets_num;
- // Definitions for static const data members of locale::_Impl
- const locale::id* const
- locale::_Impl::_S_id_collate[] =
- {
- &std::collate<char>::id,
-#ifdef _GLIBCPP_USE_WCHAR_T
- &std::collate<wchar_t>::id,
+ // Definitions for locale::id of standard facets.
+ locale::id ctype<char>::id;
+ locale::id codecvt<char, char, mbstate_t>::id;
+ locale::id num_get<char>::id;
+ locale::id num_put<char>::id;
+ locale::id numpunct<char>::id;
+ locale::id collate<char>::id;
+ locale::id time_get<char>::id;
+ locale::id time_put<char>::id;
+ locale::id money_get<char>::id;
+ locale::id money_put<char>::id;
+ locale::id moneypunct<char, false>::id;
+ locale::id moneypunct<char, true>::id;
+ locale::id messages<char>::id;
+
+#ifdef _GLIBCPP_USE_WCHAR_T
+ locale::id ctype<wchar_t>::id;
+ locale::id codecvt<wchar_t, char, mbstate_t>::id;
+ locale::id num_get<wchar_t>::id;
+ locale::id num_put<wchar_t>::id;
+ locale::id numpunct<wchar_t>::id;
+ locale::id collate<wchar_t>::id;
+ locale::id time_get<wchar_t>::id;
+ locale::id time_put<wchar_t>::id;
+ locale::id money_get<wchar_t>::id;
+ locale::id money_put<wchar_t>::id;
+ locale::id moneypunct<wchar_t, false>::id;
+ locale::id moneypunct<wchar_t, true>::id;
+ locale::id messages<wchar_t>::id;
#endif
- 0
- };
-
+
+ // Definitions for static const data members of locale::id
+ size_t locale::id::_S_highwater; // init'd to 0 by linker
+
+ // Definitions for static const data members of locale::_Impl
const locale::id* const
locale::_Impl::_S_id_ctype[] =
{
&std::ctype<char>::id,
-#ifdef _GLIBCPP_USE_WCHAR_T
- &std::ctype<wchar_t>::id,
-#endif
&codecvt<char, char, mbstate_t>::id,
#ifdef _GLIBCPP_USE_WCHAR_T
+ &std::ctype<wchar_t>::id,
&codecvt<wchar_t, char, mbstate_t>::id,
#endif
0
};
const locale::id* const
- locale::_Impl::_S_id_monetary[] =
+ locale::_Impl::_S_id_numeric[] =
{
- &moneypunct<char, false>::id,
-#ifdef _GLIBCPP_USE_WCHAR_T
- &moneypunct<wchar_t, false>::id,
-#endif
- &std::moneypunct<char,true >::id,
-#ifdef _GLIBCPP_USE_WCHAR_T
- &moneypunct<wchar_t,true >::id,
-#endif
- &money_get<char>::id,
-#ifdef _GLIBCPP_USE_WCHAR_T
- &money_get<wchar_t>::id,
-#endif
- &money_put<char>::id,
+ &num_get<char>::id,
+ &num_put<char>::id,
+ &numpunct<char>::id,
#ifdef _GLIBCPP_USE_WCHAR_T
- &money_put<wchar_t>::id,
+ &num_get<wchar_t>::id,
+ &num_put<wchar_t>::id,
+ &numpunct<wchar_t>::id,
#endif
0
};
-
+
const locale::id* const
- locale::_Impl::_S_id_numeric[] =
+ locale::_Impl::_S_id_collate[] =
{
- &numpunct<char>::id,
-#ifdef _GLIBCPP_USE_WCHAR_T
- &numpunct<wchar_t>::id,
-#endif
- &num_get<char>::id,
- #ifdef _GLIBCPP_USE_WCHAR_T
- &num_get<wchar_t>::id,
-#endif
- &num_put<char>::id,
+ &std::collate<char>::id,
#ifdef _GLIBCPP_USE_WCHAR_T
- &num_put<wchar_t>::id,
+ &std::collate<wchar_t>::id,
#endif
0
};
-
+
const locale::id* const
locale::_Impl::_S_id_time[] =
{
&time_get<char>::id,
-#ifdef _GLIBCPP_USE_WCHAR_T
- &time_get<wchar_t>::id,
-#endif
&time_put<char>::id,
#ifdef _GLIBCPP_USE_WCHAR_T
+ &time_get<wchar_t>::id,
&time_put<wchar_t>::id,
#endif
0
};
const locale::id* const
- locale::_Impl::_S_id_messages[] =
+ locale::_Impl::_S_id_monetary[] =
{
- &time_get<char>::id,
+ &money_get<char>::id,
+ &money_put<char>::id,
+ &moneypunct<char, false>::id,
+ &moneypunct<char, true >::id,
#ifdef _GLIBCPP_USE_WCHAR_T
- &time_get<wchar_t>::id,
+ &money_get<wchar_t>::id,
+ &money_put<wchar_t>::id,
+ &moneypunct<wchar_t, false>::id,
+ &moneypunct<wchar_t, true >::id,
#endif
- &time_put<char>::id,
+ 0
+ };
+
+ const locale::id* const
+ locale::_Impl::_S_id_messages[] =
+ {
+ &std::messages<char>::id,
#ifdef _GLIBCPP_USE_WCHAR_T
- &time_put<wchar_t>::id,
+ &std::messages<wchar_t>::id,
#endif
0
};
locale::_Impl::_S_facet_categories[] =
{
// Order must match the decl order in class locale.
- locale::_Impl::_S_id_collate,
locale::_Impl::_S_id_ctype,
- locale::_Impl::_S_id_monetary,
locale::_Impl::_S_id_numeric,
+ locale::_Impl::_S_id_collate,
locale::_Impl::_S_id_time,
+ locale::_Impl::_S_id_monetary,
locale::_Impl::_S_id_messages,
0
};
- // Definitions for static const data members of locale::id
- size_t locale::id::_S_highwater; // init'd to 0 by linker
-
// Definitions for static const data members of money_base
const money_base::pattern
money_base::_S_default_pattern = {{symbol, sign, none, value}};;
// Platform-specific initialization code for ctype tables.
#include <bits/ctype_noninline.h>
- locale::id ctype<char>::id;
-
const size_t ctype<char>::table_size;
ctype<char>::~ctype()
: ctype<char>(new mask[table_size], true, __refs)
{ }
- locale::id collate<char>::id;
-
collate<char>::collate(size_t __refs)
: _Collate<char>(__refs) { }
: messages<char>(__refs) { }
#ifdef _GLIBCPP_USE_WCHAR_T
- locale::id ctype<wchar_t>::id;
-
ctype<wchar_t>::__wmask_type
ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
{
ctype_byname(const char* /*__s*/, size_t __refs)
: ctype<wchar_t>(__refs) { }
- locale::id collate<wchar_t>::id;
-
collate<wchar_t>::
collate(size_t __refs)
: _Collate<wchar_t> (__refs) { }
static void(_Impl::* ctors[]) (const char*) =
{
// NB: Order must match the decl order in class locale.
- &locale::_Impl::_M_construct_collate,
&locale::_Impl::_M_construct_ctype,
- &locale::_Impl::_M_construct_monetary,
&locale::_Impl::_M_construct_numeric,
+ &locale::_Impl::_M_construct_collate,
&locale::_Impl::_M_construct_time,
+ &locale::_Impl::_M_construct_monetary,
&locale::_Impl::_M_construct_messages,
0
};
locale::_Impl::
_M_replace_categories(const _Impl* __other, category __cat)
{
- unsigned int __mask = locale::all & -static_cast<unsigned int>(locale::all);
+ category __mask = locale::all & -static_cast<unsigned int>(locale::all);
for (unsigned int __ix = 0; (-__mask & __cat) != 0; ++__ix, (__mask <<= 1))
{
if (__mask & __cat)
_M_facet_init(new collate_byname<char>(__name, 0));
#ifdef _GLIBCPP_USE_WCHAR_T
_M_facet_init(new collate_byname<wchar_t>(__name, 0));
-#endif /* _GLIBCPP_USE_WCHAR_T */
+#endif
}
void
locale::_Impl::_M_construct_ctype(const char* __name)
{
_M_facet_init(new ctype_byname<char>(__name, 0));
-#ifdef _GLIBCPP_USE_WCHAR_T
- _M_facet_init(new ctype_byname<wchar_t>(__name, 0));
-#endif /* _GLIBCPP_USE_WCHAR_T */
_M_facet_init(new codecvt_byname<char, char, mbstate_t>(__name));
#ifdef _GLIBCPP_USE_WCHAR_T
+ _M_facet_init(new ctype_byname<wchar_t>(__name, 0));
_M_facet_init(new codecvt_byname<wchar_t, char, mbstate_t>(__name));
-#endif /* _GLIBCPP_USE_WCHAR_T */
+#endif
}
void
locale::_Impl::_M_construct_monetary(const char* __name)
{
+ _M_replace_facet(locale::_S_classic, &money_get<char>::id);
+ _M_replace_facet(locale::_S_classic, &money_put<char>::id);
_M_facet_init(new moneypunct_byname<char, false>(__name, 0));
-#ifdef _GLIBCPP_USE_WCHAR_T
- _M_facet_init(new moneypunct_byname<wchar_t, false>(__name, 0));
-#endif /* _GLIBCPP_USE_WCHAR_T */
_M_facet_init(new moneypunct_byname<char, true >(__name, 0));
-#ifdef _GLIBCPP_USE_WCHAR_T
- _M_facet_init(new moneypunct_byname<wchar_t, true >(__name, 0));
-#endif /* _GLIBCPP_USE_WCHAR_T */
-
- _M_replace_facet(locale::_S_classic, &money_get<char>::id);
#ifdef _GLIBCPP_USE_WCHAR_T
_M_replace_facet(locale::_S_classic, &money_get<wchar_t>::id);
-#endif /* _GLIBCPP_USE_WCHAR_T */
- _M_replace_facet(locale::_S_classic, &money_put<char>::id);
-#ifdef _GLIBCPP_USE_WCHAR_T
_M_replace_facet(locale::_S_classic, &money_put<wchar_t>::id);
-#endif /* _GLIBCPP_USE_WCHAR_T */
+ _M_facet_init(new moneypunct_byname<wchar_t, false>(__name, 0));
+ _M_facet_init(new moneypunct_byname<wchar_t, true >(__name, 0));
+#endif
}
void
locale::_Impl::_M_construct_numeric(const char* __name)
{
- _M_facet_init(new numpunct_byname<char>(__name, 0));
-#ifdef _GLIBCPP_USE_WCHAR_T
- _M_facet_init(new numpunct_byname<wchar_t>(__name, 0));
-#endif /* _GLIBCPP_USE_WCHAR_T */
-
_M_replace_facet(locale::_S_classic, &num_get<char>::id);
-#ifdef _GLIBCPP_USE_WCHAR_T
- _M_replace_facet(locale::_S_classic, &num_get<wchar_t>::id);
-#endif /* _GLIBCPP_USE_WCHAR_T */
_M_replace_facet(locale::_S_classic, &num_put<char>::id);
+ _M_facet_init(new numpunct_byname<char>(__name, 0));
#ifdef _GLIBCPP_USE_WCHAR_T
+ _M_replace_facet(locale::_S_classic, &num_get<wchar_t>::id);
_M_replace_facet(locale::_S_classic, &num_put<wchar_t>::id);
-#endif /* _GLIBCPP_USE_WCHAR_T */
+ _M_facet_init(new numpunct_byname<wchar_t>(__name, 0));
+#endif
}
void
locale::_Impl::_M_construct_time(const char* __name)
{
_M_facet_init(new time_get_byname<char>(__name, 0));
-#ifdef _GLIBCPP_USE_WCHAR_T
- _M_facet_init(new time_get_byname<wchar_t>(__name, 0));
-#endif /* _GLIBCPP_USE_WCHAR_T */
_M_facet_init(new time_put_byname<char>(__name, 0));
#ifdef _GLIBCPP_USE_WCHAR_T
+ _M_facet_init(new time_get_byname<wchar_t>(__name, 0));
_M_facet_init(new time_put_byname<wchar_t>(__name, 0));
-#endif /* _GLIBCPP_USE_WCHAR_T */
+#endif
}
void
_M_facet_init(new messages_byname<char>(__name, 0));
#ifdef _GLIBCPP_USE_WCHAR_T
_M_facet_init(new messages_byname<wchar_t>(__name, 0));
-#endif /* _GLIBCPP_USE_WCHAR_T */
+#endif
}
}
git://gcc.gnu.org / gcc.git / commitdiff