public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Matthias Kretz <mkretz@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-10540] libstdc++: Fix uses of non-reserved names in simd header Date: Thu, 23 Feb 2023 10:43:36 +0000 (GMT) [thread overview] Message-ID: <20230223104336.825703858C5E@sourceware.org> (raw) https://gcc.gnu.org/g:5ecf4567452cf10d3f9970d414f1c21622c122f8 commit r11-10540-g5ecf4567452cf10d3f9970d414f1c21622c122f8 Author: Matthias Kretz <m.kretz@gsi.de> Date: Thu Feb 16 16:29:54 2023 +0100 libstdc++: Fix uses of non-reserved names in simd header Signed-off-by: Matthias Kretz <m.kretz@gsi.de> libstdc++-v3/ChangeLog: * include/experimental/bits/simd.h (__extract_part, split): Use reserved name for template parameter. (cherry picked from commit bb920f561e983c64d146f173dc4ebc098441a962) Diff: --- libstdc++-v3/include/experimental/bits/simd.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libstdc++-v3/include/experimental/bits/simd.h b/libstdc++-v3/include/experimental/bits/simd.h index e9a07018cf0..cd811df7bfc 100644 --- a/libstdc++-v3/include/experimental/bits/simd.h +++ b/libstdc++-v3/include/experimental/bits/simd.h @@ -3595,7 +3595,7 @@ template <int _Index, int _Total, int _Combine = 1, typename _Tp, size_t _Np> _SimdWrapper<_Tp, _Np / _Total * _Combine> __extract_part(const _SimdWrapper<_Tp, _Np> __x); -template <int Index, int Parts, int _Combine = 1, typename _Tp, typename _A0, +template <int _Index, int _Parts, int _Combine = 1, typename _Tp, typename _A0, typename... _As> _GLIBCXX_SIMD_INTRINSIC auto __extract_part(const _SimdTuple<_Tp, _A0, _As...>& __x); @@ -3708,19 +3708,19 @@ template <size_t... _Sizes, typename _Tp, typename... _As> // split<simd>(simd) {{{ template <typename _V, typename _Ap, - size_t Parts = simd_size_v<typename _V::value_type, _Ap> / _V::size()> - enable_if_t<simd_size_v<typename _V::value_type, _Ap> == Parts * _V::size() - && is_simd_v<_V>, array<_V, Parts>> + size_t _Parts = simd_size_v<typename _V::value_type, _Ap> / _V::size()> + enable_if_t<simd_size_v<typename _V::value_type, _Ap> == _Parts * _V::size() + && is_simd_v<_V>, array<_V, _Parts>> split(const simd<typename _V::value_type, _Ap>& __x) { using _Tp = typename _V::value_type; - if constexpr (Parts == 1) + if constexpr (_Parts == 1) { return {simd_cast<_V>(__x)}; } else if (__x._M_is_constprop()) { - return __generate_from_n_evaluations<Parts, array<_V, Parts>>([&]( + return __generate_from_n_evaluations<_Parts, array<_V, _Parts>>([&]( auto __i) constexpr { return _V([&](auto __j) constexpr { return __x[__i * _V::size() + __j]; @@ -3738,13 +3738,13 @@ template <typename _V, typename _Ap, #ifdef _GLIBCXX_SIMD_USE_ALIASING_LOADS const __may_alias<_Tp>* const __element_ptr = reinterpret_cast<const __may_alias<_Tp>*>(&__data(__x)); - return __generate_from_n_evaluations<Parts, array<_V, Parts>>([&]( + return __generate_from_n_evaluations<_Parts, array<_V, _Parts>>([&]( auto __i) constexpr { return _V(__element_ptr + __i * _V::size(), vector_aligned); }); #else const auto& __xx = __data(__x); - return __generate_from_n_evaluations<Parts, array<_V, Parts>>([&]( + return __generate_from_n_evaluations<_Parts, array<_V, _Parts>>([&]( auto __i) constexpr { [[maybe_unused]] constexpr size_t __offset = decltype(__i)::value * _V::size(); @@ -3758,12 +3758,12 @@ template <typename _V, typename _Ap, else if constexpr (is_same_v<typename _V::abi_type, simd_abi::scalar>) { // normally memcpy should work here as well - return __generate_from_n_evaluations<Parts, array<_V, Parts>>([&]( + return __generate_from_n_evaluations<_Parts, array<_V, _Parts>>([&]( auto __i) constexpr { return __x[__i]; }); } else { - return __generate_from_n_evaluations<Parts, array<_V, Parts>>([&]( + return __generate_from_n_evaluations<_Parts, array<_V, _Parts>>([&]( auto __i) constexpr { if constexpr (__is_fixed_size_abi_v<typename _V::abi_type>) return _V([&](auto __j) constexpr { @@ -3771,7 +3771,7 @@ template <typename _V, typename _Ap, }); else return _V(__private_init, - __extract_part<decltype(__i)::value, Parts>(__data(__x))); + __extract_part<decltype(__i)::value, _Parts>(__data(__x))); }); } }
reply other threads:[~2023-02-23 10:43 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230223104336.825703858C5E@sourceware.org \ --to=mkretz@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).