Skip to content

Commit 91632c8

Browse files
author
Arthur O'Dwyer
committed
[libc++] [NFC] Normalize some #ifndef _LIBCPP_HAS_NO_CONCEPTS.
(cherry picked from commit 93e7f35)
1 parent c7463a9 commit 91632c8

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

libcxx/include/__algorithm/in_in_out_result.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@
1414
#include <__config>
1515
#include <__utility/move.h>
1616

17+
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18+
#pragma GCC system_header
19+
#endif
20+
1721
_LIBCPP_BEGIN_NAMESPACE_STD
1822

19-
#ifndef _LIBCPP_HAS_NO_CONCEPTS
23+
#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
2024

2125
namespace ranges {
26+
2227
template <class _I1, class _I2, class _O1>
2328
struct in_in_out_result {
2429
[[no_unique_address]] _I1 in1;
@@ -39,10 +44,11 @@ struct in_in_out_result {
3944
return {_VSTD::move(in1), _VSTD::move(in2), _VSTD::move(out)};
4045
}
4146
};
47+
4248
} // namespace ranges
4349

44-
#endif // _LIBCPP_HAS_NO_CONCEPTS
50+
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
4551

4652
_LIBCPP_END_NAMESPACE_STD
4753

48-
#endif // _LIBCPP___ALGORITHM_IN_IN_RESULT_H
54+
#endif // _LIBCPP___ALGORITHM_IN_IN_OUT_RESULT_H

libcxx/include/__algorithm/in_in_result.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@
1414
#include <__config>
1515
#include <__utility/move.h>
1616

17+
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18+
#pragma GCC system_header
19+
#endif
20+
1721
_LIBCPP_BEGIN_NAMESPACE_STD
1822

19-
#ifndef _LIBCPP_HAS_NO_CONCEPTS
23+
#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
2024

2125
namespace ranges {
26+
2227
template <class _I1, class _I2>
2328
struct in_in_result {
2429
[[no_unique_address]] _I1 in1;
@@ -36,9 +41,10 @@ struct in_in_result {
3641
_LIBCPP_HIDE_FROM_ABI constexpr
3742
operator in_in_result<_II1, _II2>() && { return {_VSTD::move(in1), _VSTD::move(in2)}; }
3843
};
44+
3945
} // namespace ranges
4046

41-
#endif // _LIBCPP_HAS_NO_CONCEPTS
47+
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
4248

4349
_LIBCPP_END_NAMESPACE_STD
4450

libcxx/include/__algorithm/in_out_result.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
_LIBCPP_BEGIN_NAMESPACE_STD
2222

2323
#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
24+
2425
namespace ranges {
2526

2627
template<class _InputIterator, class _OutputIterator>
@@ -45,6 +46,7 @@ struct in_out_result {
4546
};
4647

4748
} // namespace ranges
49+
4850
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
4951

5052
_LIBCPP_END_NAMESPACE_STD

libcxx/include/__iterator/indirectly_comparable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
_LIBCPP_BEGIN_NAMESPACE_STD
1919

20-
#ifndef _LIBCPP_HAS_NO_CONCEPTS
20+
#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
2121

2222
template <class _I1, class _I2, class _Rp, class _P1 = identity, class _P2 = identity>
2323
concept indirectly_comparable =
2424
indirect_binary_predicate<_Rp, projected<_I1, _P1>, projected<_I2, _P2>>;
2525

26-
#endif // _LIBCPP_HAS_NO_CONCEPTS
26+
#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
2727

2828
_LIBCPP_END_NAMESPACE_STD
2929

0 commit comments

Comments
 (0)