Skip to content

Commit 0c90e88

Browse files
committed
[libc++][NFC] Replace _ALIGNAS_TYPE with alignas in iostream.cpp
1 parent 5535716 commit 0c90e88

File tree

1 file changed

+14
-22
lines changed

1 file changed

+14
-22
lines changed

libcxx/src/iostream.cpp

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,83 +21,75 @@
2121

2222
_LIBCPP_BEGIN_NAMESPACE_STD
2323

24-
_ALIGNAS_TYPE(istream)
25-
_LIBCPP_EXPORTED_FROM_ABI char cin[sizeof(istream)]
24+
alignas(istream) _LIBCPP_EXPORTED_FROM_ABI char cin[sizeof(istream)]
2625
#if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__)
2726
__asm__("?cin@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_istream@DU?$char_traits@D@" _LIBCPP_ABI_NAMESPACE_STR
2827
"@std@@@12@A")
2928
#endif
3029
;
31-
_ALIGNAS_TYPE(__stdinbuf<char>) static char __cin[sizeof(__stdinbuf<char>)];
30+
alignas(__stdinbuf<char>) static char __cin[sizeof(__stdinbuf<char>)];
3231
static mbstate_t mb_cin;
3332

3433
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
35-
_ALIGNAS_TYPE(wistream)
36-
_LIBCPP_EXPORTED_FROM_ABI char wcin[sizeof(wistream)]
34+
alignas(wistream) _LIBCPP_EXPORTED_FROM_ABI char wcin[sizeof(wistream)]
3735
# if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__)
3836
__asm__("?wcin@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_istream@_WU?$char_traits@_W@" _LIBCPP_ABI_NAMESPACE_STR
3937
"@std@@@12@A")
4038
# endif
4139
;
42-
_ALIGNAS_TYPE(__stdinbuf<wchar_t>) static char __wcin[sizeof(__stdinbuf<wchar_t>)];
40+
alignas(__stdinbuf<wchar_t>) static char __wcin[sizeof(__stdinbuf<wchar_t>)];
4341
static mbstate_t mb_wcin;
4442
#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
4543

46-
_ALIGNAS_TYPE(ostream)
47-
_LIBCPP_EXPORTED_FROM_ABI char cout[sizeof(ostream)]
44+
alignas(ostream) _LIBCPP_EXPORTED_FROM_ABI char cout[sizeof(ostream)]
4845
#if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__)
4946
__asm__("?cout@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@DU?$char_traits@D@" _LIBCPP_ABI_NAMESPACE_STR
5047
"@std@@@12@A")
5148
#endif
5249
;
53-
_ALIGNAS_TYPE(__stdoutbuf<char>) static char __cout[sizeof(__stdoutbuf<char>)];
50+
alignas(__stdoutbuf<char>) static char __cout[sizeof(__stdoutbuf<char>)];
5451
static mbstate_t mb_cout;
5552

5653
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
57-
_ALIGNAS_TYPE(wostream)
58-
_LIBCPP_EXPORTED_FROM_ABI char wcout[sizeof(wostream)]
54+
alignas(wostream) _LIBCPP_EXPORTED_FROM_ABI char wcout[sizeof(wostream)]
5955
# if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__)
6056
__asm__("?wcout@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@_WU?$char_traits@_W@" _LIBCPP_ABI_NAMESPACE_STR
6157
"@std@@@12@A")
6258
# endif
6359
;
64-
_ALIGNAS_TYPE(__stdoutbuf<wchar_t>) static char __wcout[sizeof(__stdoutbuf<wchar_t>)];
60+
alignas(__stdoutbuf<wchar_t>) static char __wcout[sizeof(__stdoutbuf<wchar_t>)];
6561
static mbstate_t mb_wcout;
6662
#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
6763

68-
_ALIGNAS_TYPE(ostream)
69-
_LIBCPP_EXPORTED_FROM_ABI char cerr[sizeof(ostream)]
64+
alignas(ostream) _LIBCPP_EXPORTED_FROM_ABI char cerr[sizeof(ostream)]
7065
#if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__)
7166
__asm__("?cerr@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@DU?$char_traits@D@" _LIBCPP_ABI_NAMESPACE_STR
7267
"@std@@@12@A")
7368
#endif
7469
;
75-
_ALIGNAS_TYPE(__stdoutbuf<char>) static char __cerr[sizeof(__stdoutbuf<char>)];
70+
alignas(__stdoutbuf<char>) static char __cerr[sizeof(__stdoutbuf<char>)];
7671
static mbstate_t mb_cerr;
7772

7873
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
79-
_ALIGNAS_TYPE(wostream)
80-
_LIBCPP_EXPORTED_FROM_ABI char wcerr[sizeof(wostream)]
74+
alignas(wostream) _LIBCPP_EXPORTED_FROM_ABI char wcerr[sizeof(wostream)]
8175
# if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__)
8276
__asm__("?wcerr@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@_WU?$char_traits@_W@" _LIBCPP_ABI_NAMESPACE_STR
8377
"@std@@@12@A")
8478
# endif
8579
;
86-
_ALIGNAS_TYPE(__stdoutbuf<wchar_t>) static char __wcerr[sizeof(__stdoutbuf<wchar_t>)];
80+
alignas(__stdoutbuf<wchar_t>) static char __wcerr[sizeof(__stdoutbuf<wchar_t>)];
8781
static mbstate_t mb_wcerr;
8882
#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
8983

90-
_ALIGNAS_TYPE(ostream)
91-
_LIBCPP_EXPORTED_FROM_ABI char clog[sizeof(ostream)]
84+
alignas(ostream) _LIBCPP_EXPORTED_FROM_ABI char clog[sizeof(ostream)]
9285
#if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__)
9386
__asm__("?clog@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@DU?$char_traits@D@" _LIBCPP_ABI_NAMESPACE_STR
9487
"@std@@@12@A")
9588
#endif
9689
;
9790

9891
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
99-
_ALIGNAS_TYPE(wostream)
100-
_LIBCPP_EXPORTED_FROM_ABI char wclog[sizeof(wostream)]
92+
alignas(wostream) _LIBCPP_EXPORTED_FROM_ABI char wclog[sizeof(wostream)]
10193
# if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__)
10294
__asm__("?wclog@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@_WU?$char_traits@_W@" _LIBCPP_ABI_NAMESPACE_STR
10395
"@std@@@12@A")

0 commit comments

Comments
 (0)