Skip to content

Commit 8651b8d

Browse files
committed
removed charN_t facet installations
1 parent a813f4b commit 8651b8d

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/libcxx/src/locale.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ locale::__imp::__imp(size_t refs) : facet(refs), facets_(N), name_("C") {
170170
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
171171
install(&make<codecvt<wchar_t, char, mbstate_t> >(1u));
172172
#endif
173+
#ifndef _EZ80
173174
_LIBCPP_SUPPRESS_DEPRECATED_PUSH
174175
install(&make<codecvt<char16_t, char, mbstate_t> >(1u));
175176
install(&make<codecvt<char32_t, char, mbstate_t> >(1u));
@@ -178,6 +179,7 @@ locale::__imp::__imp(size_t refs) : facet(refs), facets_(N), name_("C") {
178179
install(&make<codecvt<char16_t, char8_t, mbstate_t> >(1u));
179180
install(&make<codecvt<char32_t, char8_t, mbstate_t> >(1u));
180181
#endif
182+
#endif // _EZ80
181183
install(&make<numpunct<char> >(1u));
182184
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
183185
install(&make<numpunct<wchar_t> >(1u));
@@ -238,6 +240,7 @@ locale::__imp::__imp(const string& name, size_t refs) : facet(refs), facets_(N),
238240
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
239241
install(new codecvt_byname<wchar_t, char, mbstate_t>(name_));
240242
#endif
243+
#ifndef _EZ80
241244
_LIBCPP_SUPPRESS_DEPRECATED_PUSH
242245
install(new codecvt_byname<char16_t, char, mbstate_t>(name_));
243246
install(new codecvt_byname<char32_t, char, mbstate_t>(name_));
@@ -246,6 +249,7 @@ locale::__imp::__imp(const string& name, size_t refs) : facet(refs), facets_(N),
246249
install(new codecvt_byname<char16_t, char8_t, mbstate_t>(name_));
247250
install(new codecvt_byname<char32_t, char8_t, mbstate_t>(name_));
248251
#endif
252+
#endif // _EZ80
249253
install(new numpunct_byname<char>(name_));
250254
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
251255
install(new numpunct_byname<wchar_t>(name_));
@@ -309,6 +313,7 @@ locale::__imp::__imp(const __imp& other, const string& name, locale::category c)
309313
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
310314
install(new codecvt_byname<wchar_t, char, mbstate_t>(name));
311315
#endif
316+
#ifndef _EZ80
312317
_LIBCPP_SUPPRESS_DEPRECATED_PUSH
313318
install(new codecvt_byname<char16_t, char, mbstate_t>(name));
314319
install(new codecvt_byname<char32_t, char, mbstate_t>(name));
@@ -317,6 +322,7 @@ locale::__imp::__imp(const __imp& other, const string& name, locale::category c)
317322
install(new codecvt_byname<char16_t, char8_t, mbstate_t>(name));
318323
install(new codecvt_byname<char32_t, char8_t, mbstate_t>(name));
319324
#endif
325+
#endif // _EZ80
320326
}
321327
if (c & locale::monetary) {
322328
install(new moneypunct_byname<char, false>(name));
@@ -385,6 +391,7 @@ locale::__imp::__imp(const __imp& other, const __imp& one, locale::category c)
385391
install_from<std::ctype<wchar_t> >(one);
386392
#endif
387393
install_from<std::codecvt<char, char, mbstate_t> >(one);
394+
#ifndef _EZ80
388395
_LIBCPP_SUPPRESS_DEPRECATED_PUSH
389396
install_from<std::codecvt<char16_t, char, mbstate_t> >(one);
390397
install_from<std::codecvt<char32_t, char, mbstate_t> >(one);
@@ -393,6 +400,7 @@ locale::__imp::__imp(const __imp& other, const __imp& one, locale::category c)
393400
install_from<std::codecvt<char16_t, char8_t, mbstate_t> >(one);
394401
install_from<std::codecvt<char32_t, char8_t, mbstate_t> >(one);
395402
#endif
403+
#endif // _EZ80
396404
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
397405
install_from<std::codecvt<wchar_t, char, mbstate_t> >(one);
398406
#endif

0 commit comments

Comments
 (0)