From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id E50733858401; Tue, 16 Nov 2021 16:43:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E50733858401 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-5311] libstdc++: Use hidden friends for vector::reference swap overloads X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: ba6e17e78db543b336c196b55fa6430e513f1941 X-Git-Newrev: 59434931fb658f0a180ce3f3305cb3987ed2b56d Message-Id: <20211116164326.E50733858401@sourceware.org> Date: Tue, 16 Nov 2021 16:43:26 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Nov 2021 16:43:27 -0000 https://gcc.gnu.org/g:59434931fb658f0a180ce3f3305cb3987ed2b56d commit r12-5311-g59434931fb658f0a180ce3f3305cb3987ed2b56d Author: Jonathan Wakely Date: Thu Nov 11 20:51:15 2021 +0000 libstdc++: Use hidden friends for vector::reference swap overloads These swap overloads are non-standard, but are needed to make swap work for vector::reference rvalues. They don't need to be called explicitly, only via ADL, so hide them from normal lookup. This is what I've proposed as the resolution to LWG 3638. libstdc++-v3/ChangeLog: * include/bits/stl_bvector.h (swap(_Bit_reference, _Bit_reference)) (swap(_Bit_reference, bool&), swap(bool&, _Bit_reference)): Define as hidden friends of _Bit_reference. Diff: --- libstdc++-v3/include/bits/stl_bvector.h | 50 ++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index 381c47b6132..68070685baf 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -125,36 +125,36 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER void flip() _GLIBCXX_NOEXCEPT { *_M_p ^= _M_mask; } - }; #if __cplusplus >= 201103L - _GLIBCXX20_CONSTEXPR - inline void - swap(_Bit_reference __x, _Bit_reference __y) noexcept - { - bool __tmp = __x; - __x = __y; - __y = __tmp; - } + _GLIBCXX20_CONSTEXPR + friend void + swap(_Bit_reference __x, _Bit_reference __y) noexcept + { + bool __tmp = __x; + __x = __y; + __y = __tmp; + } - _GLIBCXX20_CONSTEXPR - inline void - swap(_Bit_reference __x, bool& __y) noexcept - { - bool __tmp = __x; - __x = __y; - __y = __tmp; - } + _GLIBCXX20_CONSTEXPR + friend void + swap(_Bit_reference __x, bool& __y) noexcept + { + bool __tmp = __x; + __x = __y; + __y = __tmp; + } - _GLIBCXX20_CONSTEXPR - inline void - swap(bool& __x, _Bit_reference __y) noexcept - { - bool __tmp = __x; - __x = __y; - __y = __tmp; - } + _GLIBCXX20_CONSTEXPR + friend void + swap(bool& __x, _Bit_reference __y) noexcept + { + bool __tmp = __x; + __x = __y; + __y = __tmp; + } #endif + }; struct _Bit_iterator_base : public std::iterator