From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 514AD3858C52; Fri, 9 Sep 2022 20:14:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 514AD3858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662754449; bh=XOSYAyNSzImVxKj5ZhsORVNo3YFqaM7hcakfBhAj2WE=; h=From:To:Subject:Date:From; b=YiSt7u6mLgZKlnAmVvxBqH5akJ3N2r9r+m6yfLQUE1BA54XZqX2sjah74lhyeCZod ooaFryWdYDaFE5WHdDbnJwZJcsjJyQTOQ1OBKIX+8Va22aJXmwHm5z+HeuX4fyO53+ Ev3D/tA/oEIeNrWoHN1FXEvsq6jtEbP0rHPn/IhE= 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 r13-2570] libstdc++: Rename parameter to avoid darwin __weak qualifier X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 8298427f6b546cabb853edd45c009cd1967b9d38 X-Git-Newrev: 007680f946eaffa3c6321624129e1ec18e673091 Message-Id: <20220909201409.514AD3858C52@sourceware.org> Date: Fri, 9 Sep 2022 20:14:09 +0000 (GMT) List-Id: https://gcc.gnu.org/g:007680f946eaffa3c6321624129e1ec18e673091 commit r13-2570-g007680f946eaffa3c6321624129e1ec18e673091 Author: Jonathan Wakely Date: Fri Sep 9 21:03:58 2022 +0100 libstdc++: Rename parameter to avoid darwin __weak qualifier libstdc++-v3/ChangeLog: * include/bits/atomic_base.h (__atomic_impl::__compare_exchange): Rename __weak to __is_weak. * testsuite/17_intro/names.cc: Add __weak and __strong. Diff: --- libstdc++-v3/include/bits/atomic_base.h | 7 ++++--- libstdc++-v3/testsuite/17_intro/names.cc | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h index 29315547aab..6ea3268fdf0 100644 --- a/libstdc++-v3/include/bits/atomic_base.h +++ b/libstdc++-v3/include/bits/atomic_base.h @@ -990,7 +990,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template _GLIBCXX_ALWAYS_INLINE bool __compare_exchange(_Tp& __val, _Val<_Tp>& __e, _Val<_Tp>& __i, - bool __weak, memory_order __s, memory_order __f) noexcept + bool __is_weak, + memory_order __s, memory_order __f) noexcept { __glibcxx_assert(__is_valid_cmpexch_failure_order(__f)); @@ -1005,7 +1006,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __atomic_impl::__clear_padding(*__exp); if (__atomic_compare_exchange(std::__addressof(__val), __exp, __atomic_impl::__clear_padding(__i), - __weak, int(__s), int(__f))) + __is_weak, int(__s), int(__f))) return true; __builtin_memcpy(std::__addressof(__e), __exp, sizeof(_Vp)); return false; @@ -1014,7 +1015,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __atomic_compare_exchange(std::__addressof(__val), std::__addressof(__e), std::__addressof(__i), - __weak, int(__s), int(__f)); + __is_weak, int(__s), int(__f)); } } // namespace __atomic_impl diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index ede2fe8caa7..86fb8f8999b 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -129,6 +129,10 @@ // This clashes with newlib so don't use it. # define __lockable cannot be used as an identifier +#ifndef __APPLE__ +#define __weak predefined qualifier on darwin +#define __strong predefined qualifier on darwin +#endif // Common template parameter names #define OutputIterator OutputIterator is not a reserved name