Skip to content

Commit d0c5f2b

Browse files
committed
Huh, I wonder how I got git clang-format to miss those changes =/
1 parent 450f5ce commit d0c5f2b

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

libcxx/benchmarks/algorithms/set_intersection.bench.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@ int main(int argc, char** argv) { /**/
190190
if (benchmark::ReportUnrecognizedArguments(argc, argv))
191191
return 1;
192192
const std::vector<size_t> Quantities = {
193-
1 << 0,
194-
1 << 4,
195-
1 << 8,
196-
1 << 14,
193+
1 << 0,
194+
1 << 4,
195+
1 << 8,
196+
1 << 14,
197197
// Running each benchmark in parallel consumes too much memory with MSAN
198198
// and can lead to the test process being killed.
199199
#if !TEST_HAS_FEATURE(memory_sanitizer)
200-
1 << 18
200+
1 << 18
201201
#endif
202202
};
203203

libcxx/include/__algorithm/set_intersection.h

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ struct _LIBCPP_NODISCARD_EXT __set_intersector {
5959
__result_(__result),
6060
__comp_(__comp) {}
6161

62-
_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI
63-
_LIBCPP_CONSTEXPR_SINCE_CXX20 __set_intersection_result<_InIter1, _InIter2, _OutIter>
64-
operator()() && {
62+
_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
63+
__set_intersection_result<_InIter1, _InIter2, _OutIter>
64+
operator()() && {
6565
while (__first2_ != __last2_) {
6666
__advance1_and_maybe_add_result();
6767
if (__first1_ == __last1_)
@@ -121,17 +121,17 @@ template <class _AlgPolicy,
121121
class _InForwardIter2,
122122
class _Sent2,
123123
class _OutIter>
124-
_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI
125-
_LIBCPP_CONSTEXPR_SINCE_CXX20 __set_intersection_result<_InForwardIter1, _InForwardIter2, _OutIter>
126-
__set_intersection(
127-
_InForwardIter1 __first1,
128-
_Sent1 __last1,
129-
_InForwardIter2 __first2,
130-
_Sent2 __last2,
131-
_OutIter __result,
132-
_Compare&& __comp,
133-
std::forward_iterator_tag,
134-
std::forward_iterator_tag) {
124+
_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
125+
__set_intersection_result<_InForwardIter1, _InForwardIter2, _OutIter>
126+
__set_intersection(
127+
_InForwardIter1 __first1,
128+
_Sent1 __last1,
129+
_InForwardIter2 __first2,
130+
_Sent2 __last2,
131+
_OutIter __result,
132+
_Compare&& __comp,
133+
std::forward_iterator_tag,
134+
std::forward_iterator_tag) {
135135
std::__set_intersector<_AlgPolicy, _Compare, _InForwardIter1, _Sent1, _InForwardIter2, _Sent2, _OutIter>
136136
__intersector(__first1, __last1, __first2, __last2, __result, __comp);
137137
return std::move(__intersector)();
@@ -145,17 +145,17 @@ template <class _AlgPolicy,
145145
class _InInputIter2,
146146
class _Sent2,
147147
class _OutIter>
148-
_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI
149-
_LIBCPP_CONSTEXPR_SINCE_CXX20 __set_intersection_result<_InInputIter1, _InInputIter2, _OutIter>
150-
__set_intersection(
151-
_InInputIter1 __first1,
152-
_Sent1 __last1,
153-
_InInputIter2 __first2,
154-
_Sent2 __last2,
155-
_OutIter __result,
156-
_Compare&& __comp,
157-
std::input_iterator_tag,
158-
std::input_iterator_tag) {
148+
_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
149+
__set_intersection_result<_InInputIter1, _InInputIter2, _OutIter>
150+
__set_intersection(
151+
_InInputIter1 __first1,
152+
_Sent1 __last1,
153+
_InInputIter2 __first2,
154+
_Sent2 __last2,
155+
_OutIter __result,
156+
_Compare&& __comp,
157+
std::input_iterator_tag,
158+
std::input_iterator_tag) {
159159
while (__first1 != __last1 && __first2 != __last2) {
160160
if (__comp(*__first1, *__first2))
161161
++__first1;
@@ -189,10 +189,10 @@ class __set_intersection_iter_category {
189189
};
190190

191191
template <class _AlgPolicy, class _Compare, class _InIter1, class _Sent1, class _InIter2, class _Sent2, class _OutIter>
192-
_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI
193-
_LIBCPP_CONSTEXPR_SINCE_CXX20 __set_intersection_result<_InIter1, _InIter2, _OutIter>
194-
__set_intersection(
195-
_InIter1 __first1, _Sent1 __last1, _InIter2 __first2, _Sent2 __last2, _OutIter __result, _Compare&& __comp) {
192+
_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
193+
__set_intersection_result<_InIter1, _InIter2, _OutIter>
194+
__set_intersection(
195+
_InIter1 __first1, _Sent1 __last1, _InIter2 __first2, _Sent2 __last2, _OutIter __result, _Compare&& __comp) {
196196
return std::__set_intersection<_AlgPolicy>(
197197
std::move(__first1),
198198
std::move(__last1),

0 commit comments

Comments
 (0)