diff options
| author | Reid Kleckner <rnk@google.com> | 2021-01-15 08:56:34 -0800 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2021-01-15 11:44:13 -0800 |
| commit | 4f24d0dd5386cc0ff61be23062b89855da87094b (patch) | |
| tree | 3aa457553c21cfc2f1f795e5734e12f08c07a5de /libcxx/src/locale.cpp | |
| parent | 84de4faf4cae2885056c608db8256e9f039050b3 (diff) | |
| download | llvm-4f24d0dd5386cc0ff61be23062b89855da87094b.tar.gz | |
Fix libc++ clang-cl build, swap attribute order
Clang insists that __attribute__ attributes precede __declspec
attributes. This is a longstanding known issue:
https://llvm.org/pr24559. Re-order the visibility and deprecation macros
to fix the build.
Differential Revision: https://reviews.llvm.org/D94788
Diffstat (limited to 'libcxx/src/locale.cpp')
| -rw-r--r-- | libcxx/src/locale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp index 42bac3c371cd..f109389f68f3 100644 --- a/libcxx/src/locale.cpp +++ b/libcxx/src/locale.cpp @@ -6334,8 +6334,8 @@ template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS messages_byname<wchar_t> template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS codecvt_byname<char, char, mbstate_t>; template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS codecvt_byname<wchar_t, char, mbstate_t>; -template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS _LIBCPP_DEPRECATED_IN_CXX20 codecvt_byname<char16_t, char, mbstate_t>; -template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS _LIBCPP_DEPRECATED_IN_CXX20 codecvt_byname<char32_t, char, mbstate_t>; +template class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS codecvt_byname<char16_t, char, mbstate_t>; +template class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS codecvt_byname<char32_t, char, mbstate_t>; #ifndef _LIBCPP_NO_HAS_CHAR8_T template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS codecvt_byname<char16_t, char8_t, mbstate_t>; template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS codecvt_byname<char32_t, char8_t, mbstate_t>; |