Skip to content

Commit 6e5b5cf

Browse files
jkarns275jkarns275
committed
[P1831R1] Remove specific header files from tests
1 parent 685824d commit 6e5b5cf

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎libcxx/test/libcxx/atomics/atomics.types.operations/atomic_volatile_require_lock_free_in_cxx20.verify.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,38 +50,38 @@ void f() {
5050

5151
volatile std::atomic<arr> va{};
5252

53-
// expected-warning@__atomic/atomic.h:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
53+
// expected-warning@*:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
5454
va.operator=(test_value);
5555

56-
// expected-warning@__atomic/atomic_base.h:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
56+
// expected-warning@*:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
5757
va.store(test_value, ord);
5858

59-
// expected-warning@__atomic/atomic_base.h:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
59+
// expected-warning@*:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
6060
va.load(ord);
6161

62-
// expected-warning@__atomic/atomic_base.h:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
62+
// expected-warning@*:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
6363
va.operator arr();
6464

65-
// expected-warning@__atomic/atomic_base.h:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
65+
// expected-warning@*:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
6666
va.exchange(test_value, ord);
6767

68-
// expected-warning@__atomic/atomic_base.h:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
68+
// expected-warning@*:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
6969
va.compare_exchange_weak(test_value, test_value, ord);
7070

71-
// expected-warning@__atomic/atomic_base.h:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
71+
// expected-warning@*:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
7272
va.compare_exchange_weak(test_value, test_value, ord, ord);
7373

74-
// expected-warning@__atomic/atomic_base.h:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
74+
// expected-warning@*:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
7575
va.compare_exchange_strong(test_value, test_value, ord);
7676

77-
// expected-warning@__atomic/atomic_base.h:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
77+
// expected-warning@*:* {{'__deprecated_if_not_always_lock_free<arr, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
7878
va.compare_exchange_strong(test_value, test_value, ord, ord);
7979

8080
const volatile std::atomic<arr2> cva{};
8181

82-
// expected-warning@__atomic/atomic_base.h:* {{'__deprecated_if_not_always_lock_free<arr2, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
82+
// expected-warning@*:* {{'__deprecated_if_not_always_lock_free<arr2, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
8383
cva.load(ord);
8484

85-
// expected-warning@__atomic/atomic_base.h:* {{'__deprecated_if_not_always_lock_free<arr2, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
85+
// expected-warning@*:* {{'__deprecated_if_not_always_lock_free<arr2, false>' is deprecated: volatile atomic operations are deprecated when std::atomic<T>::is_always_lock_free is false}}
8686
cva.operator arr2();
8787
}

‎libcxx/test/libcxx/utilities/tuple/tuple.tuple/tuple.helper/volatile_tuple_element_deprecated_in_cxx20.verify.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
[[maybe_unused]] std::tuple_element<0, std::tuple<void, void>> test;
1616

17-
// expected-warning@__tuple/tuple_element.h:* {{'__volatile_deprecated_since_cxx20_warning<volatile std::tuple<void, void>>' is deprecated}}
17+
// expected-warning@*:* {{'__volatile_deprecated_since_cxx20_warning<volatile std::tuple<void, void>>' is deprecated}}
1818
[[maybe_unused]] std::tuple_element<0, volatile std::tuple<void, void>> vol_test;
1919

20-
// expected-warning@__tuple/tuple_element.h:* {{'__volatile_deprecated_since_cxx20_warning<const volatile std::tuple<void, void>>' is deprecated}}
20+
// expected-warning@*:* {{'__volatile_deprecated_since_cxx20_warning<const volatile std::tuple<void, void>>' is deprecated}}
2121
[[maybe_unused]] std::tuple_element<0, const volatile std::tuple<void, void>> const_vol_test;

‎libcxx/test/libcxx/utilities/tuple/tuple.tuple/tuple.helper/volatile_tuple_size_deprecated_in_cxx20.verify.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
[[maybe_unused]] std::tuple_size<std::tuple<void, void>> test;
1616

17-
// expected-warning@__tuple/tuple_size.h:* {{'__volatile_deprecated_since_cxx20_warning<volatile std::tuple<void, void>>' is deprecated}}
17+
// expected-warning@*:* {{'__volatile_deprecated_since_cxx20_warning<volatile std::tuple<void, void>>' is deprecated}}
1818
[[maybe_unused]] std::tuple_size<volatile std::tuple<void, void>> vol_test;
1919

20-
// expected-warning@__tuple/tuple_size.h:* {{'__volatile_deprecated_since_cxx20_warning<const volatile std::tuple<void, void>>' is deprecated}}
20+
// expected-warning@*:* {{'__volatile_deprecated_since_cxx20_warning<const volatile std::tuple<void, void>>' is deprecated}}
2121
[[maybe_unused]] std::tuple_size<const volatile std::tuple<void, void>> const_vol_test;

‎libcxx/test/libcxx/utilities/variant/variant.variant/variant.helper/volatile_deprecated.verify.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ typedef std::variant<void, int> vars;
1616

1717
[[maybe_unused]] std::variant_alternative<0, vars> alt_test;
1818

19-
// expected-warning@variant:* {{'__volatile_deprecated_since_cxx20_warning<volatile std::variant<void, int>>' is deprecated}}
19+
// expected-warning@*:* {{'__volatile_deprecated_since_cxx20_warning<volatile std::variant<void, int>>' is deprecated}}
2020
[[maybe_unused]] std::variant_alternative<0, volatile vars> vol_alt_test;
2121

22-
// expected-warning@variant:* {{'__volatile_deprecated_since_cxx20_warning<const volatile std::variant<void, int>>' is deprecated}}
22+
// expected-warning@*:* {{'__volatile_deprecated_since_cxx20_warning<const volatile std::variant<void, int>>' is deprecated}}
2323
[[maybe_unused]] std::variant_alternative<0, const volatile vars> const_vol_alt_test;
2424

2525
[[maybe_unused]] std::variant_size<vars> size_test;
2626

27-
// expected-warning@variant:* {{'__volatile_deprecated_since_cxx20_warning<volatile std::variant<void, int>>' is deprecated}}
27+
// expected-warning@*:* {{'__volatile_deprecated_since_cxx20_warning<volatile std::variant<void, int>>' is deprecated}}
2828
[[maybe_unused]] std::variant_size<volatile vars> vol_size_test;
2929

30-
// expected-warning@variant:* {{'__volatile_deprecated_since_cxx20_warning<const volatile std::variant<void, int>>' is deprecated}}
30+
// expected-warning@*:* {{'__volatile_deprecated_since_cxx20_warning<const volatile std::variant<void, int>>' is deprecated}}
3131
[[maybe_unused]] std::variant_size<const volatile vars> const_vol_size_test;

0 commit comments

Comments
 (0)