Skip to content

Commit aa83d21

Browse files
frederick-vs-jafrederick-vs-ja
committed
Restore to attribute-based method
1 parent cf9e2e2 commit aa83d21

File tree

10 files changed

+46
-23
lines changed

10 files changed

+46
-23
lines changed

‎libcxx/include/ccomplex‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,17 @@
2323
# pragma GCC system_header
2424
#endif
2525

26-
#if _LIBCPP_STD_VER >= 17 && defined(__DEPRECATED) && __DEPRECATED && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
26+
#if _LIBCPP_STD_VER >= 17
27+
28+
using __standard_header_ccomplex
2729
# if _LIBCPP_STD_VER >= 20
28-
# warning <ccomplex> is removed in C++20. Include <complex> instead.
30+
_LIBCPP_DEPRECATED_("removed in C++20. Include <complex> instead.")
2931
# else
30-
# warning <ccomplex> is deprecated. Include <complex> instead.
32+
_LIBCPP_DEPRECATED_("Include <complex> instead.")
3133
# endif
34+
= void;
35+
using __use_standard_header_ccomplex = __standard_header_ccomplex;
36+
3237
#endif
3338

3439
#endif // _LIBCPP_CCOMPLEX

‎libcxx/include/ciso646‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@
2121
# pragma GCC system_header
2222
#endif
2323

24-
#if _LIBCPP_STD_VER >= 20 && defined(__DEPRECATED) && __DEPRECATED && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
25-
# warning <ciso646> is removed in C++20. Include <version> instead.
24+
#if _LIBCPP_STD_VER >= 20
25+
26+
using __standard_header_ciso646 _LIBCPP_DEPRECATED_("removed in C++20. Include <version> instead.") = void;
27+
using __use_standard_header_ciso646 = __standard_header_ciso646;
28+
2629
#endif
2730

2831
#endif // _LIBCPP_CISO646

‎libcxx/include/cstdalign‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,17 @@ Macros:
4040
#undef __alignof_is_defined
4141
#define __alignof_is_defined 1
4242

43-
#if _LIBCPP_STD_VER >= 17 && defined(__DEPRECATED) && __DEPRECATED && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
43+
#if _LIBCPP_STD_VER >= 17
44+
45+
using __standard_header_cstdalign
4446
# if _LIBCPP_STD_VER >= 20
45-
# warning <cstdalign> is removed in C++20.
47+
_LIBCPP_DEPRECATED_("removed in C++20.")
4648
# else
47-
# warning <cstdalign> is deprecated.
49+
_LIBCPP_DEPRECATED
4850
# endif
51+
= void;
52+
using __use_standard_header_cstdalign = __standard_header_cstdalign;
53+
4954
#endif
5055

5156
#endif // _LIBCPP_CSTDALIGN

‎libcxx/include/cstdbool‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,17 @@ Macros:
2828
#undef __bool_true_false_are_defined
2929
#define __bool_true_false_are_defined 1
3030

31-
#if _LIBCPP_STD_VER >= 17 && defined(__DEPRECATED) && __DEPRECATED && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
31+
#if _LIBCPP_STD_VER >= 17
32+
33+
using __standard_header_cstdbool
3234
# if _LIBCPP_STD_VER >= 20
33-
# warning <cstdbool> is removed in C++20.
35+
_LIBCPP_DEPRECATED_("removed in C++20.")
3436
# else
35-
# warning <cstdbool> is deprecated.
37+
_LIBCPP_DEPRECATED
3638
# endif
39+
= void;
40+
using __use_standard_header_cstdbool = __standard_header_cstdbool;
41+
3742
#endif
3843

3944
#endif // _LIBCPP_CSTDBOOL

‎libcxx/include/ctgmath‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,17 @@
2525
# pragma GCC system_header
2626
#endif
2727

28-
#if _LIBCPP_STD_VER >= 17 && defined(__DEPRECATED) && __DEPRECATED && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
28+
#if _LIBCPP_STD_VER >= 17
29+
30+
using __standard_header_ctgmath
2931
# if _LIBCPP_STD_VER >= 20
30-
# warning <ctgmath> is removed in C++20. Include <cmath> and <complex> instead.
32+
_LIBCPP_DEPRECATED_("removed in C++20. Include <cmath> and <complex> instead.")
3133
# else
32-
# warning <ctgmath> is deprecated. Include <cmath> and <complex> instead.
34+
_LIBCPP_DEPRECATED_("Include <cmath> and <complex> instead.")
3335
# endif
36+
= void;
37+
using __use_standard_header_ctgmath = __standard_header_ctgmath;
38+
3439
#endif
3540

3641
#endif // _LIBCPP_CTGMATH

‎libcxx/test/std/depr/depr.cpp.headers/ccomplex.verify.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <ccomplex>
2020

2121
#if TEST_STD_VER >= 20
22-
// expected-warning@ccomplex:* {{<ccomplex> is removed in C++20. Include <complex> instead.}}
22+
// expected-warning@ccomplex:* {{'__standard_header_ccomplex' is deprecated: removed in C++20. Include <complex> instead.}}
2323
#else
24-
// expected-warning@ccomplex:* {{<ccomplex> is deprecated. Include <complex> instead.}}
24+
// expected-warning@ccomplex:* {{'__standard_header_ccomplex' is deprecated: Include <complex> instead.}}
2525
#endif

‎libcxx/test/std/depr/depr.cpp.headers/ciso646.verify.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
// UNSUPPORTED: clang-modules-build
1616

1717
#include <ciso646>
18-
// expected-warning@ciso646:* {{<ciso646> is removed in C++20. Include <version> instead.}}
18+
// expected-warning@ciso646:* {{'__standard_header_ciso646' is deprecated: removed in C++20. Include <version> instead.}}

‎libcxx/test/std/depr/depr.cpp.headers/cstdalign.verify.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <cstdalign>
2020

2121
#if TEST_STD_VER >= 20
22-
// expected-warning@cstdalign:* {{<cstdalign> is removed in C++20.}}
22+
// expected-warning@cstdalign:* {{'__standard_header_cstdalign' is deprecated: removed in C++20.}}
2323
#else
24-
// expected-warning@cstdalign:* {{<cstdalign> is deprecated.}}
24+
// expected-warning@cstdalign:* {{'__standard_header_cstdalign' is deprecated}}
2525
#endif

‎libcxx/test/std/depr/depr.cpp.headers/cstdbool.verify.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <cstdbool>
2020

2121
#if TEST_STD_VER >= 20
22-
// expected-warning@cstdbool:* {{<cstdbool> is removed in C++20.}}
22+
// expected-warning@cstdbool:* {{'__standard_header_cstdbool' is deprecated: removed in C++20.}}
2323
#else
24-
// expected-warning@cstdbool:* {{<cstdbool> is deprecated.}}
24+
// expected-warning@cstdbool:* {{'__standard_header_cstdbool' is deprecated}}
2525
#endif

‎libcxx/test/std/depr/depr.cpp.headers/ctgmath.verify.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <ctgmath>
2020

2121
#if TEST_STD_VER >= 20
22-
// expected-warning@ctgmath:* {{<ctgmath> is removed in C++20. Include <cmath> and <complex> instead.}}
22+
// expected-warning@ctgmath:* {{'__standard_header_ctgmath' is deprecated: removed in C++20. Include <cmath> and <complex> instead.}}
2323
#else
24-
// expected-warning@ctgmath:* {{<ctgmath> is deprecated. Include <cmath> and <complex> instead.}}
24+
// expected-warning@ctgmath:* {{'__standard_header_ctgmath' is deprecated: Include <cmath> and <complex> instead.}}
2525
#endif

0 commit comments

Comments
 (0)