| diff --git a/include/__locale b/include/__locale |
| --- a/include/__locale |
| +++ b/include/__locale |
| @@ -1484,14 +1484,14 @@ |
| |
| _LIBCPP_SUPPRESS_DEPRECATED_PUSH |
| template <> |
| -struct _LIBCPP_TEMPLATE_VIS __narrow_to_utf8<16> |
| +struct _LIBCPP_TYPE_VIS __narrow_to_utf8<16> |
| : public codecvt<char16_t, char, mbstate_t> |
| { |
| _LIBCPP_INLINE_VISIBILITY |
| __narrow_to_utf8() : codecvt<char16_t, char, mbstate_t>(1) {} |
| _LIBCPP_SUPPRESS_DEPRECATED_POP |
| |
| - _LIBCPP_EXPORTED_FROM_ABI ~__narrow_to_utf8(); |
| + ~__narrow_to_utf8(); |
| |
| template <class _OutputIterator, class _CharT> |
| _LIBCPP_INLINE_VISIBILITY |
| @@ -1520,14 +1520,14 @@ |
| |
| _LIBCPP_SUPPRESS_DEPRECATED_PUSH |
| template <> |
| -struct _LIBCPP_TEMPLATE_VIS __narrow_to_utf8<32> |
| +struct _LIBCPP_TYPE_VIS __narrow_to_utf8<32> |
| : public codecvt<char32_t, char, mbstate_t> |
| { |
| _LIBCPP_INLINE_VISIBILITY |
| __narrow_to_utf8() : codecvt<char32_t, char, mbstate_t>(1) {} |
| _LIBCPP_SUPPRESS_DEPRECATED_POP |
| |
| - _LIBCPP_EXPORTED_FROM_ABI ~__narrow_to_utf8(); |
| + ~__narrow_to_utf8(); |
| |
| template <class _OutputIterator, class _CharT> |
| _LIBCPP_INLINE_VISIBILITY |
| @@ -1578,14 +1578,14 @@ |
| |
| _LIBCPP_SUPPRESS_DEPRECATED_PUSH |
| template <> |
| -struct _LIBCPP_TEMPLATE_VIS __widen_from_utf8<16> |
| +struct _LIBCPP_TYPE_VIS __widen_from_utf8<16> |
| : public codecvt<char16_t, char, mbstate_t> |
| { |
| _LIBCPP_INLINE_VISIBILITY |
| __widen_from_utf8() : codecvt<char16_t, char, mbstate_t>(1) {} |
| _LIBCPP_SUPPRESS_DEPRECATED_POP |
| |
| - _LIBCPP_EXPORTED_FROM_ABI ~__widen_from_utf8(); |
| + ~__widen_from_utf8(); |
| |
| template <class _OutputIterator> |
| _LIBCPP_INLINE_VISIBILITY |
| @@ -1614,14 +1614,14 @@ |
| |
| _LIBCPP_SUPPRESS_DEPRECATED_PUSH |
| template <> |
| -struct _LIBCPP_TEMPLATE_VIS __widen_from_utf8<32> |
| +struct _LIBCPP_TYPE_VIS __widen_from_utf8<32> |
| : public codecvt<char32_t, char, mbstate_t> |
| { |
| _LIBCPP_INLINE_VISIBILITY |
| __widen_from_utf8() : codecvt<char32_t, char, mbstate_t>(1) {} |
| _LIBCPP_SUPPRESS_DEPRECATED_POP |
| |
| - _LIBCPP_EXPORTED_FROM_ABI ~__widen_from_utf8(); |
| + ~__widen_from_utf8(); |
| |
| template <class _OutputIterator> |
| _LIBCPP_INLINE_VISIBILITY |