Skip to content

Commit 21ef59a

Browse files
brad0brad0
committed
[libcxx] Replace remaining _LIBCPP_INLINE_VISIBILITY in __support
Replace remaining _LIBCPP_INLINE_VISIBILITY in __support with _LIBCPP_HIDE_FROM_ABI. Reviewed by: Mordante Differential Revision: https://reviews.llvm.org/D129922
1 parent 52232ab commit 21ef59a

File tree

4 files changed

+59
-61
lines changed

4 files changed

+59
-61
lines changed

‎libcxx/include/__support/android/locale_bionic.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@ extern "C" {
4646
extern "C" {
4747
#endif
4848

49-
inline _LIBCPP_INLINE_VISIBILITY float strtof_l(const char* __nptr, char** __endptr,
50-
locale_t) {
49+
inline _LIBCPP_HIDE_FROM_ABI float
50+
strtof_l(const char* __nptr, char** __endptr, locale_t) {
5151
return ::strtof(__nptr, __endptr);
5252
}
5353

54-
inline _LIBCPP_INLINE_VISIBILITY double strtod_l(const char* __nptr,
55-
char** __endptr, locale_t) {
54+
inline _LIBCPP_HIDE_FROM_ABI double
55+
strtod_l(const char* __nptr, char** __endptr, locale_t) {
5656
return ::strtod(__nptr, __endptr);
5757
}
5858

59-
inline _LIBCPP_INLINE_VISIBILITY long strtol_l(const char* __nptr, char** __endptr,
60-
int __base, locale_t) {
59+
inline _LIBCPP_HIDE_FROM_ABI long
60+
strtol_l(const char* __nptr, char** __endptr, int __base, locale_t) {
6161
return ::strtol(__nptr, __endptr, __base);
6262
}
6363

‎libcxx/include/__support/win32/locale_win32.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,13 @@ decltype(MB_CUR_MAX) MB_CUR_MAX_L( locale_t __l );
223223
_LIBCPP_FUNC_VIS float strtof_l(const char*, char**, locale_t);
224224
_LIBCPP_FUNC_VIS long double strtold_l(const char*, char**, locale_t);
225225
#endif
226-
inline _LIBCPP_INLINE_VISIBILITY
227-
int
226+
inline _LIBCPP_HIDE_FROM_ABI int
228227
islower_l(int __c, _locale_t __loc)
229228
{
230229
return _islower_l((int)__c, __loc);
231230
}
232231

233-
inline _LIBCPP_INLINE_VISIBILITY
234-
int
232+
inline _LIBCPP_HIDE_FROM_ABI int
235233
isupper_l(int __c, _locale_t __loc)
236234
{
237235
return _isupper_l((int)__c, __loc);

‎libcxx/include/__support/xlocale/__posix_l_fallback.h‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,141 +19,141 @@
1919
extern "C" {
2020
#endif
2121

22-
inline _LIBCPP_INLINE_VISIBILITY int isalnum_l(int __c, locale_t) {
22+
inline _LIBCPP_HIDE_FROM_ABI int isalnum_l(int __c, locale_t) {
2323
return ::isalnum(__c);
2424
}
2525

26-
inline _LIBCPP_INLINE_VISIBILITY int isalpha_l(int __c, locale_t) {
26+
inline _LIBCPP_HIDE_FROM_ABI int isalpha_l(int __c, locale_t) {
2727
return ::isalpha(__c);
2828
}
2929

30-
inline _LIBCPP_INLINE_VISIBILITY int isblank_l(int __c, locale_t) {
30+
inline _LIBCPP_HIDE_FROM_ABI int isblank_l(int __c, locale_t) {
3131
return ::isblank(__c);
3232
}
3333

34-
inline _LIBCPP_INLINE_VISIBILITY int iscntrl_l(int __c, locale_t) {
34+
inline _LIBCPP_HIDE_FROM_ABI int iscntrl_l(int __c, locale_t) {
3535
return ::iscntrl(__c);
3636
}
3737

38-
inline _LIBCPP_INLINE_VISIBILITY int isdigit_l(int __c, locale_t) {
38+
inline _LIBCPP_HIDE_FROM_ABI int isdigit_l(int __c, locale_t) {
3939
return ::isdigit(__c);
4040
}
4141

42-
inline _LIBCPP_INLINE_VISIBILITY int isgraph_l(int __c, locale_t) {
42+
inline _LIBCPP_HIDE_FROM_ABI int isgraph_l(int __c, locale_t) {
4343
return ::isgraph(__c);
4444
}
4545

46-
inline _LIBCPP_INLINE_VISIBILITY int islower_l(int __c, locale_t) {
46+
inline _LIBCPP_HIDE_FROM_ABI int islower_l(int __c, locale_t) {
4747
return ::islower(__c);
4848
}
4949

50-
inline _LIBCPP_INLINE_VISIBILITY int isprint_l(int __c, locale_t) {
50+
inline _LIBCPP_HIDE_FROM_ABI int isprint_l(int __c, locale_t) {
5151
return ::isprint(__c);
5252
}
5353

54-
inline _LIBCPP_INLINE_VISIBILITY int ispunct_l(int __c, locale_t) {
54+
inline _LIBCPP_HIDE_FROM_ABI int ispunct_l(int __c, locale_t) {
5555
return ::ispunct(__c);
5656
}
5757

58-
inline _LIBCPP_INLINE_VISIBILITY int isspace_l(int __c, locale_t) {
58+
inline _LIBCPP_HIDE_FROM_ABI int isspace_l(int __c, locale_t) {
5959
return ::isspace(__c);
6060
}
6161

62-
inline _LIBCPP_INLINE_VISIBILITY int isupper_l(int __c, locale_t) {
62+
inline _LIBCPP_HIDE_FROM_ABI int isupper_l(int __c, locale_t) {
6363
return ::isupper(__c);
6464
}
6565

66-
inline _LIBCPP_INLINE_VISIBILITY int isxdigit_l(int __c, locale_t) {
66+
inline _LIBCPP_HIDE_FROM_ABI int isxdigit_l(int __c, locale_t) {
6767
return ::isxdigit(__c);
6868
}
6969

70-
inline _LIBCPP_INLINE_VISIBILITY int iswalnum_l(wint_t __c, locale_t) {
70+
inline _LIBCPP_HIDE_FROM_ABI int iswalnum_l(wint_t __c, locale_t) {
7171
return ::iswalnum(__c);
7272
}
7373

74-
inline _LIBCPP_INLINE_VISIBILITY int iswalpha_l(wint_t __c, locale_t) {
74+
inline _LIBCPP_HIDE_FROM_ABI int iswalpha_l(wint_t __c, locale_t) {
7575
return ::iswalpha(__c);
7676
}
7777

78-
inline _LIBCPP_INLINE_VISIBILITY int iswblank_l(wint_t __c, locale_t) {
78+
inline _LIBCPP_HIDE_FROM_ABI int iswblank_l(wint_t __c, locale_t) {
7979
return ::iswblank(__c);
8080
}
8181

82-
inline _LIBCPP_INLINE_VISIBILITY int iswcntrl_l(wint_t __c, locale_t) {
82+
inline _LIBCPP_HIDE_FROM_ABI int iswcntrl_l(wint_t __c, locale_t) {
8383
return ::iswcntrl(__c);
8484
}
8585

86-
inline _LIBCPP_INLINE_VISIBILITY int iswdigit_l(wint_t __c, locale_t) {
86+
inline _LIBCPP_HIDE_FROM_ABI int iswdigit_l(wint_t __c, locale_t) {
8787
return ::iswdigit(__c);
8888
}
8989

90-
inline _LIBCPP_INLINE_VISIBILITY int iswgraph_l(wint_t __c, locale_t) {
90+
inline _LIBCPP_HIDE_FROM_ABI int iswgraph_l(wint_t __c, locale_t) {
9191
return ::iswgraph(__c);
9292
}
9393

94-
inline _LIBCPP_INLINE_VISIBILITY int iswlower_l(wint_t __c, locale_t) {
94+
inline _LIBCPP_HIDE_FROM_ABI int iswlower_l(wint_t __c, locale_t) {
9595
return ::iswlower(__c);
9696
}
9797

98-
inline _LIBCPP_INLINE_VISIBILITY int iswprint_l(wint_t __c, locale_t) {
98+
inline _LIBCPP_HIDE_FROM_ABI int iswprint_l(wint_t __c, locale_t) {
9999
return ::iswprint(__c);
100100
}
101101

102-
inline _LIBCPP_INLINE_VISIBILITY int iswpunct_l(wint_t __c, locale_t) {
102+
inline _LIBCPP_HIDE_FROM_ABI int iswpunct_l(wint_t __c, locale_t) {
103103
return ::iswpunct(__c);
104104
}
105105

106-
inline _LIBCPP_INLINE_VISIBILITY int iswspace_l(wint_t __c, locale_t) {
106+
inline _LIBCPP_HIDE_FROM_ABI int iswspace_l(wint_t __c, locale_t) {
107107
return ::iswspace(__c);
108108
}
109109

110-
inline _LIBCPP_INLINE_VISIBILITY int iswupper_l(wint_t __c, locale_t) {
110+
inline _LIBCPP_HIDE_FROM_ABI int iswupper_l(wint_t __c, locale_t) {
111111
return ::iswupper(__c);
112112
}
113113

114-
inline _LIBCPP_INLINE_VISIBILITY int iswxdigit_l(wint_t __c, locale_t) {
114+
inline _LIBCPP_HIDE_FROM_ABI int iswxdigit_l(wint_t __c, locale_t) {
115115
return ::iswxdigit(__c);
116116
}
117117

118-
inline _LIBCPP_INLINE_VISIBILITY int toupper_l(int __c, locale_t) {
118+
inline _LIBCPP_HIDE_FROM_ABI int toupper_l(int __c, locale_t) {
119119
return ::toupper(__c);
120120
}
121121

122-
inline _LIBCPP_INLINE_VISIBILITY int tolower_l(int __c, locale_t) {
122+
inline _LIBCPP_HIDE_FROM_ABI int tolower_l(int __c, locale_t) {
123123
return ::tolower(__c);
124124
}
125125

126-
inline _LIBCPP_INLINE_VISIBILITY wint_t towupper_l(wint_t __c, locale_t) {
126+
inline _LIBCPP_HIDE_FROM_ABI wint_t towupper_l(wint_t __c, locale_t) {
127127
return ::towupper(__c);
128128
}
129129

130-
inline _LIBCPP_INLINE_VISIBILITY wint_t towlower_l(wint_t __c, locale_t) {
130+
inline _LIBCPP_HIDE_FROM_ABI wint_t towlower_l(wint_t __c, locale_t) {
131131
return ::towlower(__c);
132132
}
133133

134-
inline _LIBCPP_INLINE_VISIBILITY int strcoll_l(const char *__s1, const char *__s2,
135-
locale_t) {
134+
inline _LIBCPP_HIDE_FROM_ABI int
135+
strcoll_l(const char *__s1, const char *__s2, locale_t) {
136136
return ::strcoll(__s1, __s2);
137137
}
138138

139-
inline _LIBCPP_INLINE_VISIBILITY size_t strxfrm_l(char *__dest, const char *__src,
140-
size_t __n, locale_t) {
139+
inline _LIBCPP_HIDE_FROM_ABI size_t
140+
strxfrm_l(char *__dest, const char *__src, size_t __n, locale_t) {
141141
return ::strxfrm(__dest, __src, __n);
142142
}
143143

144-
inline _LIBCPP_INLINE_VISIBILITY size_t strftime_l(char *__s, size_t __max,
145-
const char *__format,
146-
const struct tm *__tm, locale_t) {
144+
inline _LIBCPP_HIDE_FROM_ABI size_t
145+
strftime_l(char *__s, size_t __max, const char *__format, const struct tm *__tm,
146+
locale_t) {
147147
return ::strftime(__s, __max, __format, __tm);
148148
}
149149

150-
inline _LIBCPP_INLINE_VISIBILITY int wcscoll_l(const wchar_t *__ws1,
151-
const wchar_t *__ws2, locale_t) {
150+
inline _LIBCPP_HIDE_FROM_ABI int
151+
wcscoll_l(const wchar_t *__ws1, const wchar_t *__ws2, locale_t) {
152152
return ::wcscoll(__ws1, __ws2);
153153
}
154154

155-
inline _LIBCPP_INLINE_VISIBILITY size_t wcsxfrm_l(wchar_t *__dest, const wchar_t *__src,
156-
size_t __n, locale_t) {
155+
inline _LIBCPP_HIDE_FROM_ABI size_t
156+
wcsxfrm_l(wchar_t *__dest, const wchar_t *__src, size_t __n, locale_t) {
157157
return ::wcsxfrm(__dest, __src, __n);
158158
}
159159

‎libcxx/include/__support/xlocale/__strtonum_fallback.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,43 +19,43 @@
1919
extern "C" {
2020
#endif
2121

22-
inline _LIBCPP_INLINE_VISIBILITY float strtof_l(const char *__nptr,
23-
char **__endptr, locale_t) {
22+
inline _LIBCPP_HIDE_FROM_ABI int float
23+
strtof_l(const char *__nptr, char **__endptr, locale_t) {
2424
return ::strtof(__nptr, __endptr);
2525
}
2626

27-
inline _LIBCPP_INLINE_VISIBILITY double strtod_l(const char *__nptr,
28-
char **__endptr, locale_t) {
27+
inline _LIBCPP_HIDE_FROM_ABI int double
28+
strtod_l(const char *__nptr, char **__endptr, locale_t) {
2929
return ::strtod(__nptr, __endptr);
3030
}
3131

32-
inline _LIBCPP_INLINE_VISIBILITY long double strtold_l(const char *__nptr,
33-
char **__endptr, locale_t) {
32+
inline _LIBCPP_HIDE_FROM_ABI int long double
33+
strtold_l(const char *__nptr, char **__endptr, locale_t) {
3434
return ::strtold(__nptr, __endptr);
3535
}
3636

37-
inline _LIBCPP_INLINE_VISIBILITY long long
37+
inline _LIBCPP_HIDE_FROM_ABI int long long
3838
strtoll_l(const char *__nptr, char **__endptr, int __base, locale_t) {
3939
return ::strtoll(__nptr, __endptr, __base);
4040
}
4141

42-
inline _LIBCPP_INLINE_VISIBILITY unsigned long long
42+
inline _LIBCPP_HIDE_FROM_ABI int unsigned long long
4343
strtoull_l(const char *__nptr, char **__endptr, int __base, locale_t) {
4444
return ::strtoull(__nptr, __endptr, __base);
4545
}
4646

47-
inline _LIBCPP_INLINE_VISIBILITY long long
47+
inline _LIBCPP_HIDE_FROM_ABI int long long
4848
wcstoll_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) {
4949
return ::wcstoll(__nptr, __endptr, __base);
5050
}
5151

52-
inline _LIBCPP_INLINE_VISIBILITY unsigned long long
52+
inline _LIBCPP_HIDE_FROM_ABI int unsigned long long
5353
wcstoull_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) {
5454
return ::wcstoull(__nptr, __endptr, __base);
5555
}
5656

57-
inline _LIBCPP_INLINE_VISIBILITY long double wcstold_l(const wchar_t *__nptr,
58-
wchar_t **__endptr, locale_t) {
57+
inline _LIBCPP_HIDE_FROM_ABI int long double
58+
wcstold_l(const wchar_t *__nptr, wchar_t **__endptr, locale_t) {
5959
return ::wcstold(__nptr, __endptr);
6060
}
6161

0 commit comments

Comments
 (0)