Skip to content

R
riscv-gcc-1
Commit 1b9ad1d9 by Jonathan Wakely Committed by Jonathan Wakely
Options

re PR libstdc++/64553 (Missing '# ifdef _GLIBCXX_USE_WCHAR_T' in src/c++11/cxx11-shim_facet.cc) 

	PR libstdc++/64553
	* src/c++11/cxx11-shim_facets.cc: Check for wchar_t support.

From-SVN: r219496
parent 5e67acc9
Showing with 43 additions and 18 deletions
libstdc++-v3/ChangeLog
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
* src/c++11/cxx11-shim_facets.cc (locale::facet::_M_sso_shim): Check * src/c++11/cxx11-shim_facets.cc (locale::facet::_M_sso_shim): Check
for RTTI support. for RTTI support.
PR libstdc++/64553
* src/c++11/cxx11-shim_facets.cc: Check for wchar_t support.
2015-01-10 Thomas Schwinge <thomas@codesourcery.com> 2015-01-10 Thomas Schwinge <thomas@codesourcery.com>
* doc/xml/manual/parallel_mode.xml: Update for libgomp being * doc/xml/manual/parallel_mode.xml: Update for libgomp being
......
libstdc++-v3/src/c++11/cxx11-shim_facets.cc
...@@ -87,13 +87,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -87,13 +87,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
union { union {
const void* _M_p; const void* _M_p;
char* _M_pc; char* _M_pc;
#ifdef _GLIBCXX_USE_WCHAR_T
wchar_t* _M_pwc; wchar_t* _M_pwc;
#endif
}; };
size_t _M_len; size_t _M_len;
char _M_unused[16]; char _M_unused[16];
operator const char*() const { return _M_pc; } operator const char*() const { return _M_pc; }
#ifdef _GLIBCXX_USE_WCHAR_T
operator const wchar_t*() const { return _M_pwc; } operator const wchar_t*() const { return _M_pwc; }
#endif
}; };
union { union {
__str_rep _M_str; __str_rep _M_str;
...@@ -251,9 +255,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -251,9 +255,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
size_t _M_grouping_size; size_t _M_grouping_size;
}; };
template class numpunct_shim<char>;
template class numpunct_shim<wchar_t>;
template<typename _CharT> template<typename _CharT>
struct collate_shim : std::collate<_CharT>, facet::__shim struct collate_shim : std::collate<_CharT>, facet::__shim
{ {
...@@ -279,9 +280,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -279,9 +280,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
}; };
template class collate_shim<char>;
template class collate_shim<wchar_t>;
template<typename _CharT> template<typename _CharT>
struct time_get_shim : std::time_get<_CharT>, facet::__shim struct time_get_shim : std::time_get<_CharT>, facet::__shim
{ {
...@@ -363,11 +361,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -363,11 +361,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__cache_type* _M_cache; __cache_type* _M_cache;
}; };
template class moneypunct_shim<char, true>;
template class moneypunct_shim<char, false>;
template class moneypunct_shim<wchar_t, true>;
template class moneypunct_shim<wchar_t, false>;
template<typename _CharT> template<typename _CharT>
struct money_get_shim : std::money_get<_CharT>, facet::__shim struct money_get_shim : std::money_get<_CharT>, facet::__shim
{ {
...@@ -409,9 +402,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -409,9 +402,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
}; };
template class money_get_shim<char>;
template class money_get_shim<wchar_t>;
template<typename _CharT> template<typename _CharT>
struct money_put_shim : std::money_put<_CharT>, facet::__shim struct money_put_shim : std::money_put<_CharT>, facet::__shim
{ {
...@@ -441,10 +431,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -441,10 +431,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
}; };
template class money_put_shim<char>;
template class money_put_shim<wchar_t>;
template<typename _CharT> template<typename _CharT>
struct messages_shim : std::messages<_CharT>, facet::__shim struct messages_shim : std::messages<_CharT>, facet::__shim
{ {
...@@ -477,8 +463,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -477,8 +463,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
}; };
template class numpunct_shim<char>;
template class collate_shim<char>;
template class moneypunct_shim<char, true>;
template class moneypunct_shim<char, false>;
template class money_get_shim<char>;
template class money_put_shim<char>;
template class messages_shim<char>; template class messages_shim<char>;
#ifdef _GLIBCXX_USE_WCHAR_T
template class numpunct_shim<wchar_t>;
template class collate_shim<wchar_t>;
template class moneypunct_shim<wchar_t, true>;
template class moneypunct_shim<wchar_t, false>;
template class money_get_shim<wchar_t>;
template class money_put_shim<wchar_t>;
template class messages_shim<wchar_t>; template class messages_shim<wchar_t>;
#endif
template<typename C> template<typename C>
inline size_t inline size_t
...@@ -524,9 +524,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -524,9 +524,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__numpunct_fill_cache(current_abi, const facet*, __numpunct_cache<char>*, __numpunct_fill_cache(current_abi, const facet*, __numpunct_cache<char>*,
const char*&, size_t&); const char*&, size_t&);
#ifdef _GLIBCXX_USE_WCHAR_T
template void template void
__numpunct_fill_cache(current_abi, const facet*, __numpunct_cache<wchar_t>*, __numpunct_fill_cache(current_abi, const facet*, __numpunct_cache<wchar_t>*,
const char*&, size_t&); const char*&, size_t&);
#endif
template<typename C> template<typename C>
int int
...@@ -540,9 +542,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -540,9 +542,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__collate_compare(current_abi, const facet*, const char*, const char*, __collate_compare(current_abi, const facet*, const char*, const char*,
const char*, const char*); const char*, const char*);
#ifdef _GLIBCXX_USE_WCHAR_T
template int template int
__collate_compare(current_abi, const facet*, const wchar_t*, const wchar_t*, __collate_compare(current_abi, const facet*, const wchar_t*, const wchar_t*,
const wchar_t*, const wchar_t*); const wchar_t*, const wchar_t*);
#endif
template<typename C> template<typename C>
void void
...@@ -557,9 +561,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -557,9 +561,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__collate_transform(current_abi, const facet*, __any_string&, __collate_transform(current_abi, const facet*, __any_string&,
const char*, const char*); const char*, const char*);
#ifdef _GLIBCXX_USE_WCHAR_T
template void template void
__collate_transform(current_abi, const facet*, __any_string&, __collate_transform(current_abi, const facet*, __any_string&,
const wchar_t*, const wchar_t*); const wchar_t*, const wchar_t*);
#endif
template<typename C, bool Intl> template<typename C, bool Intl>
void void
...@@ -599,6 +605,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -599,6 +605,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__moneypunct_fill_cache(current_abi, const facet*, __moneypunct_fill_cache(current_abi, const facet*,
__moneypunct_cache<char, false>*); __moneypunct_cache<char, false>*);
#ifdef _GLIBCXX_USE_WCHAR_T
template void template void
__moneypunct_fill_cache(current_abi, const facet*, __moneypunct_fill_cache(current_abi, const facet*,
__moneypunct_cache<wchar_t, true>*); __moneypunct_cache<wchar_t, true>*);
...@@ -606,6 +613,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -606,6 +613,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template void template void
__moneypunct_fill_cache(current_abi, const facet*, __moneypunct_fill_cache(current_abi, const facet*,
__moneypunct_cache<wchar_t, false>*); __moneypunct_cache<wchar_t, false>*);
#endif
template<typename C> template<typename C>
messages_base::catalog messages_base::catalog
...@@ -621,9 +629,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -621,9 +629,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__messages_open<char>(current_abi, const facet*, const char*, size_t, __messages_open<char>(current_abi, const facet*, const char*, size_t,
const locale&); const locale&);
#ifdef _GLIBCXX_USE_WCHAR_T
template messages_base::catalog template messages_base::catalog
__messages_open<wchar_t>(current_abi, const facet*, const char*, size_t, __messages_open<wchar_t>(current_abi, const facet*, const char*, size_t,
const locale&); const locale&);
#endif
template<typename C> template<typename C>
void void
...@@ -639,9 +649,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -639,9 +649,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__messages_get(current_abi, const facet*, __any_string&, __messages_get(current_abi, const facet*, __any_string&,
messages_base::catalog, int, int, const char*, size_t); messages_base::catalog, int, int, const char*, size_t);
#ifdef _GLIBCXX_USE_WCHAR_T
template void template void
__messages_get(current_abi, const facet*, __any_string&, __messages_get(current_abi, const facet*, __any_string&,
messages_base::catalog, int, int, const wchar_t*, size_t); messages_base::catalog, int, int, const wchar_t*, size_t);
#endif
template<typename C> template<typename C>
void void
...@@ -653,9 +665,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -653,9 +665,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template void template void
__messages_close<char>(current_abi, const facet*, messages_base::catalog c); __messages_close<char>(current_abi, const facet*, messages_base::catalog c);
#ifdef _GLIBCXX_USE_WCHAR_T
template void template void
__messages_close<wchar_t>(current_abi, const facet*, __messages_close<wchar_t>(current_abi, const facet*,
messages_base::catalog c); messages_base::catalog c);
#endif
template<typename C> template<typename C>
time_base::dateorder time_base::dateorder
...@@ -665,8 +679,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -665,8 +679,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template time_base::dateorder template time_base::dateorder
__time_get_dateorder<char>(current_abi, const facet*); __time_get_dateorder<char>(current_abi, const facet*);
#ifdef _GLIBCXX_USE_WCHAR_T
template time_base::dateorder template time_base::dateorder
__time_get_dateorder<wchar_t>(current_abi, const facet*); __time_get_dateorder<wchar_t>(current_abi, const facet*);
#endif
template<typename C> template<typename C>
istreambuf_iterator<C> istreambuf_iterator<C>
...@@ -697,10 +713,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -697,10 +713,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
istreambuf_iterator<char>, istreambuf_iterator<char>, istreambuf_iterator<char>, istreambuf_iterator<char>,
ios_base&, ios_base::iostate&, tm*, char); ios_base&, ios_base::iostate&, tm*, char);
#ifdef _GLIBCXX_USE_WCHAR_T
template istreambuf_iterator<wchar_t> template istreambuf_iterator<wchar_t>
__time_get(current_abi, const facet*, __time_get(current_abi, const facet*,
istreambuf_iterator<wchar_t>, istreambuf_iterator<wchar_t>, istreambuf_iterator<wchar_t>, istreambuf_iterator<wchar_t>,
ios_base&, ios_base::iostate&, tm*, char); ios_base&, ios_base::iostate&, tm*, char);
#endif
template<typename C> template<typename C>
istreambuf_iterator<C> istreambuf_iterator<C>
...@@ -725,11 +743,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -725,11 +743,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
bool, ios_base&, ios_base::iostate&, bool, ios_base&, ios_base::iostate&,
long double*, __any_string*); long double*, __any_string*);
#ifdef _GLIBCXX_USE_WCHAR_T
template istreambuf_iterator<wchar_t> template istreambuf_iterator<wchar_t>
__money_get(current_abi, const facet*, __money_get(current_abi, const facet*,
istreambuf_iterator<wchar_t>, istreambuf_iterator<wchar_t>, istreambuf_iterator<wchar_t>, istreambuf_iterator<wchar_t>,
bool, ios_base&, ios_base::iostate&, bool, ios_base&, ios_base::iostate&,
long double*, __any_string*); long double*, __any_string*);
#endif
template<typename C> template<typename C>
ostreambuf_iterator<C> ostreambuf_iterator<C>
...@@ -748,9 +768,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -748,9 +768,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__money_put(current_abi, const facet*, ostreambuf_iterator<char>, __money_put(current_abi, const facet*, ostreambuf_iterator<char>,
bool, ios_base&, char, long double, const __any_string*); bool, ios_base&, char, long double, const __any_string*);
#ifdef _GLIBCXX_USE_WCHAR_T
template ostreambuf_iterator<wchar_t> template ostreambuf_iterator<wchar_t>
__money_put(current_abi, const facet*, ostreambuf_iterator<wchar_t>, __money_put(current_abi, const facet*, ostreambuf_iterator<wchar_t>,
bool, ios_base&, wchar_t, long double, const __any_string*); bool, ios_base&, wchar_t, long double, const __any_string*);
#endif
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace __facet_shims } // namespace __facet_shims
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment