Skip to content

Commit d2baefa

Browse files
JoeLoserJoeLoser
committed
[libc++] Replace _LIBCPP_HAS_NO_CONCEPTS with _LIBCPP_STD_VER > 17. NFCI.
All supported compilers that support C++20 now support concepts. So, remove `_LIB_LIBCPP_HAS_NO_CONCEPTS` in favor of `_LIBCPP_STD_VER > 17`. Similarly in the tests, remove `// UNSUPPORTED: libcpp-no-concepts`. Differential Revision: https://reviews.llvm.org/D121528
1 parent c2592c3 commit d2baefa

File tree

709 files changed

+292
-1059
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

709 files changed

+292
-1059
lines changed

‎libcxx/include/__algorithm/in_found_result.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# pragma GCC system_header
1919
#endif
2020

21-
#if !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
21+
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
2222

2323
_LIBCPP_BEGIN_NAMESPACE_STD
2424

@@ -44,6 +44,6 @@ struct in_found_result {
4444

4545
_LIBCPP_END_NAMESPACE_STD
4646

47-
#endif // _LIBCPP_HAS_NO_CONCEPTS
47+
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
4848

4949
#endif // _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H

‎libcxx/include/__algorithm/in_fun_result.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
_LIBCPP_BEGIN_NAMESPACE_STD
2222

23-
#ifndef _LIBCPP_HAS_NO_CONCEPTS
23+
#if _LIBCPP_STD_VER > 17
2424

2525
namespace ranges {
2626
template <class _Ip, class _Fp>
@@ -42,7 +42,7 @@ struct in_fun_result {
4242
};
4343
} // namespace ranges
4444

45-
#endif // _LIBCPP_HAS_NO_RANGES
45+
#endif // _LIBCPP_STD_VER > 17
4646

4747
_LIBCPP_END_NAMESPACE_STD
4848

‎libcxx/include/__algorithm/in_in_out_result.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
_LIBCPP_BEGIN_NAMESPACE_STD
2222

23-
#if !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
23+
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
2424

2525
namespace ranges {
2626

@@ -47,7 +47,7 @@ struct in_in_out_result {
4747

4848
} // namespace ranges
4949

50-
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
50+
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
5151

5252
_LIBCPP_END_NAMESPACE_STD
5353

‎libcxx/include/__algorithm/in_in_result.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
_LIBCPP_BEGIN_NAMESPACE_STD
2222

23-
#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
23+
#if _LIBCPP_STD_VER > 17
2424

2525
namespace ranges {
2626

@@ -44,7 +44,7 @@ struct in_in_result {
4444

4545
} // namespace ranges
4646

47-
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
47+
#endif // _LIBCPP_STD_VER > 17
4848

4949
_LIBCPP_END_NAMESPACE_STD
5050

‎libcxx/include/__algorithm/in_out_out_result.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
_LIBCPP_BEGIN_NAMESPACE_STD
2222

23-
#ifndef _LIBCPP_HAS_NO_CONCEPTS
23+
#if _LIBCPP_STD_VER > 17
2424

2525
namespace ranges {
2626
template <class _I1, class _O1, class _O2>
@@ -45,7 +45,7 @@ struct in_out_out_result {
4545
};
4646
} // namespace ranges
4747

48-
#endif // _LIBCPP_HAS_NO_CONCEPTS
48+
#endif // _LIBCPP_STD_VER > 17
4949

5050
_LIBCPP_END_NAMESPACE_STD
5151

‎libcxx/include/__algorithm/in_out_result.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
_LIBCPP_BEGIN_NAMESPACE_STD
2222

23-
#if !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
23+
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
2424

2525
namespace ranges {
2626

@@ -47,7 +47,7 @@ struct in_out_result {
4747

4848
} // namespace ranges
4949

50-
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
50+
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
5151

5252
_LIBCPP_END_NAMESPACE_STD
5353

‎libcxx/include/__algorithm/min_max_result.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ _LIBCPP_PUSH_MACROS
2323

2424
_LIBCPP_BEGIN_NAMESPACE_STD
2525

26-
#if!defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
26+
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
2727

2828
namespace ranges {
2929

@@ -47,7 +47,7 @@ struct min_max_result {
4747

4848
} // namespace ranges
4949

50-
#endif
50+
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
5151

5252
_LIBCPP_END_NAMESPACE_STD
5353

‎libcxx/include/__algorithm/ranges_max_element.h‎

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

26-
#if !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
26+
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
2727

2828
_LIBCPP_BEGIN_NAMESPACE_STD
2929

@@ -66,6 +66,6 @@ inline namespace __cpo {
6666

6767
_LIBCPP_END_NAMESPACE_STD
6868

69-
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
69+
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
7070

7171
#endif // _LIBCPP___ALGORITHM_RANGES_MAX_ELEMENT_H

‎libcxx/include/__algorithm/ranges_min_element.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# pragma GCC system_header
2525
#endif
2626

27-
#if !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
27+
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
2828

2929
_LIBCPP_BEGIN_NAMESPACE_STD
3030

@@ -67,6 +67,6 @@ inline namespace __cpo {
6767

6868
_LIBCPP_END_NAMESPACE_STD
6969

70-
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
70+
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
7171

7272
#endif // _LIBCPP___ALGORITHM_RANGES_MIN_ELEMENT_H

‎libcxx/include/__algorithm/ranges_mismatch.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
_LIBCPP_BEGIN_NAMESPACE_STD
2929

30-
#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
30+
#if _LIBCPP_STD_VER > 17
3131

3232
namespace ranges {
3333

@@ -78,7 +78,7 @@ inline namespace __cpo {
7878
} // namespace __cpo
7979
} // namespace ranges
8080

81-
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_RANGES)
81+
#endif // _LIBCPP_STD_VER > 17
8282

8383
_LIBCPP_END_NAMESPACE_STD
8484

0 commit comments

Comments
 (0)