This is an archive of the discontinued LLVM Phabricator instance.

Differential D123463

[libc++] Rename the template arguments of the algorithm result types
ClosedPublic

Authored by philnik on Apr 10 2022, 2:55 AM.

Details

Reviewers
None
Group Reviewers
Restricted Project
Commits
rGaed0e8b8056a: [libc++] Rename the template arguments of the algorithm result types

Diff Detail

Event Timeline

philnik created this revision.Apr 10 2022, 2:55 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 10 2022, 2:55 AM
philnik requested review of this revision.Apr 10 2022, 2:55 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 10 2022, 2:55 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
philnik added a comment.Apr 10 2022, 2:55 AM

I'll land this once CI passes.

Harbormaster completed remote builds in B158900: Diff 421778.Apr 10 2022, 4:24 AM
This revision was not accepted when it landed; it landed in state Needs Review.Apr 10 2022, 5:22 AM
Closed by commit rGaed0e8b8056a: [libc++] Rename the template arguments of the algorithm result types (authored by philnik). · Explain Why
This revision was automatically updated to reflect the committed changes.
philnik added a commit: rGaed0e8b8056a: [libc++] Rename the template arguments of the algorithm result types.

Revision Contents

PathSize
libcxx/
include/
__algorithm/
16 lines
18 lines
22 lines
18 lines
22 lines
18 lines

Diff 421784

libcxx/include/__algorithm/in_found_result.h

Show All 17 Lines
# pragma GCC system_header # pragma GCC system_header
#endif #endif
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
namespace ranges { namespace ranges {
template <class _I1> template <class _InIter1>
struct in_found_result { struct in_found_result {
_LIBCPP_NO_UNIQUE_ADDRESS _I1 in; _LIBCPP_NO_UNIQUE_ADDRESS _InIter1 in;
bool found; bool found;
template <class _I2> template <class _InIter2>
requires convertible_to<const _I1&, _I2> requires convertible_to<const _InIter1&, _InIter2>
_LIBCPP_HIDE_FROM_ABI constexpr operator in_found_result<_I2>() const & { _LIBCPP_HIDE_FROM_ABI constexpr operator in_found_result<_InIter2>() const & {
return {in, found}; return {in, found};
} }
template <class _I2> template <class _InIter2>
requires convertible_to<_I1, _I2> requires convertible_to<_InIter1, _InIter2>
_LIBCPP_HIDE_FROM_ABI constexpr operator in_found_result<_I2>() && { _LIBCPP_HIDE_FROM_ABI constexpr operator in_found_result<_InIter2>() && {
return {std::move(in), found}; return {std::move(in), found};
} }
}; };
} // namespace ranges } // namespace ranges
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
#endif // _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H #endif // _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H

libcxx/include/__algorithm/in_fun_result.h

Show All 17 Lines
# pragma GCC system_header # pragma GCC system_header
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
namespace ranges { namespace ranges {
template <class _Ip, class _Fp> template <class _InIter1, class _Func1>
struct in_fun_result { struct in_fun_result {
_LIBCPP_NO_UNIQUE_ADDRESS _Ip in; _LIBCPP_NO_UNIQUE_ADDRESS _InIter1 in;
_LIBCPP_NO_UNIQUE_ADDRESS _Fp fun; _LIBCPP_NO_UNIQUE_ADDRESS _Func1 fun;
template <class _I2, class _F2> template <class _InIter2, class _Func2>
requires convertible_to<const _Ip&, _I2> && convertible_to<const _Fp&, _F2> requires convertible_to<const _InIter1&, _InIter2> && convertible_to<const _Func1&, _Func2>
_LIBCPP_HIDE_FROM_ABI constexpr operator in_fun_result<_I2, _F2>() const & { _LIBCPP_HIDE_FROM_ABI constexpr operator in_fun_result<_InIter2, _Func2>() const & {
return {in, fun}; return {in, fun};
} }
template <class _I2, class _F2> template <class _InIter2, class _Func2>
requires convertible_to<_Ip, _I2> && convertible_to<_Fp, _F2> requires convertible_to<_InIter1, _InIter2> && convertible_to<_Func1, _Func2>
_LIBCPP_HIDE_FROM_ABI constexpr operator in_fun_result<_I2, _F2>() && { _LIBCPP_HIDE_FROM_ABI constexpr operator in_fun_result<_InIter2, _Func2>() && {
return {std::move(in), std::move(fun)}; return {std::move(in), std::move(fun)};
} }
}; };
} // namespace ranges } // namespace ranges
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP___ALGORITHM_IN_FUN_RESULT_H #endif // _LIBCPP___ALGORITHM_IN_FUN_RESULT_H

libcxx/include/__algorithm/in_in_out_result.h

Show All 18 Lines
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
namespace ranges { namespace ranges {
template <class _I1, class _I2, class _O1> template <class _InIter1, class _InIter2, class _OutIter1>
struct in_in_out_result { struct in_in_out_result {
_LIBCPP_NO_UNIQUE_ADDRESS _I1 in1; _LIBCPP_NO_UNIQUE_ADDRESS _InIter1 in1;
_LIBCPP_NO_UNIQUE_ADDRESS _I2 in2; _LIBCPP_NO_UNIQUE_ADDRESS _InIter2 in2;
_LIBCPP_NO_UNIQUE_ADDRESS _O1 out; _LIBCPP_NO_UNIQUE_ADDRESS _OutIter1 out;
template <class _II1, class _II2, class _OO1> template <class _InIter3, class _InIter4, class _OutIter2>
requires convertible_to<const _I1&, _II1> && convertible_to<const _I2&, _II2> && convertible_to<const _O1&, _OO1> requires convertible_to<const _InIter1&, _InIter3>
&& convertible_to<const _InIter2&, _InIter4> && convertible_to<const _OutIter1&, _OutIter2>
_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_HIDE_FROM_ABI constexpr
operator in_in_out_result<_II1, _II2, _OO1>() const& { operator in_in_out_result<_InIter3, _InIter4, _OutIter2>() const& {
return {in1, in2, out}; return {in1, in2, out};
} }
template <class _II1, class _II2, class _OO1> template <class _InIter3, class _InIter4, class _OutIter2>
requires convertible_to<_I1, _II1> && convertible_to<_I2, _II2> && convertible_to<_O1, _OO1> requires convertible_to<_InIter1, _InIter3>
&& convertible_to<_InIter2, _InIter4> && convertible_to<_OutIter1, _OutIter2>
_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_HIDE_FROM_ABI constexpr
operator in_in_out_result<_II1, _II2, _OO1>() && { operator in_in_out_result<_InIter3, _InIter4, _OutIter2>() && {
return {std::move(in1), std::move(in2), std::move(out)}; return {std::move(in1), std::move(in2), std::move(out)};
} }
}; };
} // namespace ranges } // namespace ranges
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP___ALGORITHM_IN_IN_OUT_RESULT_H #endif // _LIBCPP___ALGORITHM_IN_IN_OUT_RESULT_H

libcxx/include/__algorithm/in_in_result.h

Show All 18 Lines
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
namespace ranges { namespace ranges {
template <class _I1, class _I2> template <class _InIter1, class _InIter2>
struct in_in_result { struct in_in_result {
_LIBCPP_NO_UNIQUE_ADDRESS _I1 in1; _LIBCPP_NO_UNIQUE_ADDRESS _InIter1 in1;
_LIBCPP_NO_UNIQUE_ADDRESS _I2 in2; _LIBCPP_NO_UNIQUE_ADDRESS _InIter2 in2;
template <class _II1, class _II2> template <class _InIter3, class _InIter4>
requires convertible_to<const _I1&, _II1> && convertible_to<const _I2&, _II2> requires convertible_to<const _InIter1&, _InIter3> && convertible_to<const _InIter2&, _InIter4>
_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_HIDE_FROM_ABI constexpr
operator in_in_result<_II1, _II2>() const & { operator in_in_result<_InIter3, _InIter4>() const & {
return {in1, in2}; return {in1, in2};
} }
template <class _II1, class _II2> template <class _InIter3, class _InIter4>
requires convertible_to<_I1, _II1> && convertible_to<_I2, _II2> requires convertible_to<_InIter1, _InIter3> && convertible_to<_InIter2, _InIter4>
_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_HIDE_FROM_ABI constexpr
operator in_in_result<_II1, _II2>() && { operator in_in_result<_InIter3, _InIter4>() && {
return {std::move(in1), std::move(in2)}; return {std::move(in1), std::move(in2)};
} }
}; };
} // namespace ranges } // namespace ranges
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP___ALGORITHM_IN_IN_RESULT_H #endif // _LIBCPP___ALGORITHM_IN_IN_RESULT_H

libcxx/include/__algorithm/in_out_out_result.h

Show All 17 Lines
# pragma GCC system_header # pragma GCC system_header
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
namespace ranges { namespace ranges {
template <class _I1, class _O1, class _O2> template <class _InIter1, class _OutIter1, class _OutIter2>
struct in_out_out_result { struct in_out_out_result {
_LIBCPP_NO_UNIQUE_ADDRESS _I1 in; _LIBCPP_NO_UNIQUE_ADDRESS _InIter1 in;
_LIBCPP_NO_UNIQUE_ADDRESS _O1 out1; _LIBCPP_NO_UNIQUE_ADDRESS _OutIter1 out1;
_LIBCPP_NO_UNIQUE_ADDRESS _O2 out2; _LIBCPP_NO_UNIQUE_ADDRESS _OutIter2 out2;
template <class _II1, class _OO1, class _OO2> template <class _InIter2, class _OutIter3, class _OutIter4>
requires convertible_to<const _I1&, _II1> && convertible_to<const _O1&, _OO1> && convertible_to<const _O2&, _OO2> requires convertible_to<const _InIter1&, _InIter2>
&& convertible_to<const _OutIter1&, _OutIter3> && convertible_to<const _OutIter2&, _OutIter4>
_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_HIDE_FROM_ABI constexpr
operator in_out_out_result<_II1, _OO1, _OO2>() const& { operator in_out_out_result<_InIter2, _OutIter3, _OutIter4>() const& {
return {in, out1, out2}; return {in, out1, out2};
} }
template <class _II1, class _OO1, class _OO2> template <class _InIter2, class _OutIter3, class _OutIter4>
requires convertible_to<_I1, _II1> && convertible_to<_O1, _OO1> && convertible_to<_O2, _OO2> requires convertible_to<_InIter1, _InIter2>
&& convertible_to<_OutIter1, _OutIter3> && convertible_to<_OutIter2, _OutIter4>
_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_HIDE_FROM_ABI constexpr
operator in_out_out_result<_II1, _OO1, _OO2>() && { operator in_out_out_result<_InIter2, _OutIter3, _OutIter4>() && {
return {std::move(in), std::move(out1), std::move(out2)}; return {std::move(in), std::move(out1), std::move(out2)};
} }
}; };
} // namespace ranges } // namespace ranges
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP___ALGORITHM_IN_OUT_OUT_RESULT_H #endif // _LIBCPP___ALGORITHM_IN_OUT_OUT_RESULT_H

libcxx/include/__algorithm/in_out_result.h

Show All 18 Lines
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
namespace ranges { namespace ranges {
template<class _I1, class _O1> template<class _InIter1, class _OutIter1>
struct in_out_result { struct in_out_result {
_LIBCPP_NO_UNIQUE_ADDRESS _I1 in; _LIBCPP_NO_UNIQUE_ADDRESS _InIter1 in;
_LIBCPP_NO_UNIQUE_ADDRESS _O1 out; _LIBCPP_NO_UNIQUE_ADDRESS _OutIter1 out;
template <class _I2, class _O2> template <class _InIter2, class _OutIter2>
requires convertible_to<const _I1&, _I2> && convertible_to<const _O1&, _O2> requires convertible_to<const _InIter1&, _InIter2> && convertible_to<const _OutIter1&, _OutIter2>
_LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDE_FROM_ABI
constexpr operator in_out_result<_I2, _O2>() const & { constexpr operator in_out_result<_InIter2, _OutIter2>() const & {
return {in, out}; return {in, out};
} }
template <class _I2, class _O2> template <class _InIter2, class _OutIter2>
requires convertible_to<_I1, _I2> && convertible_to<_O1, _O2> requires convertible_to<_InIter1, _InIter2> && convertible_to<_OutIter1, _OutIter2>
_LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDE_FROM_ABI
constexpr operator in_out_result<_I2, _O2>() && { constexpr operator in_out_result<_InIter2, _OutIter2>() && {
return {std::move(in), std::move(out)}; return {std::move(in), std::move(out)};
} }
}; };
} // namespace ranges } // namespace ranges
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) #endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP___ALGORITHM_IN_OUT_RESULT_H #endif // _LIBCPP___ALGORITHM_IN_OUT_RESULT_H