From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 1911D3853835; Thu, 24 Jun 2021 13:34:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1911D3853835 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-1788] libstdc++: Fix internal names: add missing underscores X-Act-Checkin: gcc X-Git-Author: Matthias Kretz X-Git-Refname: refs/heads/master X-Git-Oldrev: 8888795ad16fc5ebf112b5bac091dc1ebb6c45d1 X-Git-Newrev: addd5f0e61f73659c29f47a02e93bfc5e534dbf6 Message-Id: <20210624133454.1911D3853835@sourceware.org> Date: Thu, 24 Jun 2021 13:34:54 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2021 13:34:54 -0000 https://gcc.gnu.org/g:addd5f0e61f73659c29f47a02e93bfc5e534dbf6 commit r12-1788-gaddd5f0e61f73659c29f47a02e93bfc5e534dbf6 Author: Matthias Kretz Date: Thu Jun 24 14:20:15 2021 +0100 libstdc++: Fix internal names: add missing underscores Signed-off-by: Matthias Kretz libstdc++-v3/ChangeLog: * include/experimental/bits/simd_math.h (_GLIBCXX_SIMD_MATH_CALL2_): Rename arg2_ to __arg2. (_GLIBCXX_SIMD_MATH_CALL3_): Rename arg2_ to __arg2 and arg3_ to __arg3. Diff: --- libstdc++-v3/include/experimental/bits/simd_math.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/experimental/bits/simd_math.h b/libstdc++-v3/include/experimental/bits/simd_math.h index 80b6e2b4cb5..dd9aaa35967 100644 --- a/libstdc++-v3/include/experimental/bits/simd_math.h +++ b/libstdc++-v3/include/experimental/bits/simd_math.h @@ -119,10 +119,10 @@ template //}}} // _GLIBCXX_SIMD_MATH_CALL2_ {{{ -#define _GLIBCXX_SIMD_MATH_CALL2_(__name, arg2_) \ +#define _GLIBCXX_SIMD_MATH_CALL2_(__name, __arg2) \ template < \ typename _Tp, typename _Abi, typename..., \ - typename _Arg2 = _Extra_argument_type, \ + typename _Arg2 = _Extra_argument_type<__arg2, _Tp, _Abi>, \ typename _R = _Math_return_type_t< \ decltype(std::__name(declval(), _Arg2::declval())), _Tp, _Abi>> \ enable_if_t, _R> \ @@ -137,7 +137,7 @@ template \ declval(), \ declval, \ + is_same<__arg2, _Tp>, \ negation, simd<_Tp, _Abi>>>, \ is_convertible<_Up, simd<_Tp, _Abi>>, is_floating_point<_Tp>>, \ double>>())), \ @@ -147,10 +147,10 @@ template \ // }}} // _GLIBCXX_SIMD_MATH_CALL3_ {{{ -#define _GLIBCXX_SIMD_MATH_CALL3_(__name, arg2_, arg3_) \ +#define _GLIBCXX_SIMD_MATH_CALL3_(__name, __arg2, __arg3) \ template , \ - typename _Arg3 = _Extra_argument_type, \ + typename _Arg2 = _Extra_argument_type<__arg2, _Tp, _Abi>, \ + typename _Arg3 = _Extra_argument_type<__arg3, _Tp, _Abi>, \ typename _R = _Math_return_type_t< \ decltype(std::__name(declval(), _Arg2::declval(), \ _Arg3::declval())), \