diff options
| author | Patrick Palka <ppalka@redhat.com> | 2022-09-09 14:59:14 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2022-09-09 14:59:14 -0400 |
| commit | 8298427f6b546cabb853edd45c009cd1967b9d38 (patch) | |
| tree | 365f04091aeda2aee6ac643a1ceefe0e8f8bdfaf | |
| parent | e469506b7fdd1bf2c958ca3140573a474fcba3b8 (diff) | |
| download | gcc-8298427f6b546cabb853edd45c009cd1967b9d38.zip gcc-8298427f6b546cabb853edd45c009cd1967b9d38.tar.gz gcc-8298427f6b546cabb853edd45c009cd1967b9d38.tar.bz2 | |
libstdc++: Fix return type of empty zip_/adjacent_transform [PR106803]
PR libstdc++/106803
libstdc++-v3/ChangeLog:
* include/std/ranges (views::_ZipTransform::operator()): Correct
return type in the empty case.
(views::_AdjacentTransform::operator()): Likewise.
| -rw-r--r-- | libstdc++-v3/include/std/ranges | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 37ad80a..20eb4e8 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -5071,7 +5071,7 @@ namespace views::__adaptor operator() [[nodiscard]] (_Fp&& __f, _Ts&&... __ts) const { if constexpr (sizeof...(_Ts) == 0) - return views::empty<decay_t<invoke_result_t<_Fp>>>; + return views::empty<decay_t<invoke_result_t<decay_t<_Fp>&>>>; else return zip_transform_view(std::forward<_Fp>(__f), std::forward<_Ts>(__ts)...); } @@ -5762,7 +5762,7 @@ namespace views::__adaptor operator() [[nodiscard]] (_Range&& __r, _Fp&& __f) const { if constexpr (_Nm == 0) - return views::empty<tuple<>>; + return zip_transform(std::forward<_Fp>(__f)); else return adjacent_transform_view<all_t<_Range>, decay_t<_Fp>, _Nm> (std::forward<_Range>(__r), std::forward<_Fp>(__f)); |