llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-24 03:32:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Qualify calls to addressof to avoid getting ADL. Fixes PR#27254.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@266209 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2016-04-13 17:02:23 +00:00
parent dca800cd0f
commit 8165249d39
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/__mutex_base
View File

@@ -117,24 +117,24 @@ public:
unique_lock() _NOEXCEPT : __m_(nullptr), __owns_(false) {} unique_lock() _NOEXCEPT : __m_(nullptr), __owns_(false) {}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
explicit unique_lock(mutex_type& __m) explicit unique_lock(mutex_type& __m)
: __m_(addressof(__m)), __owns_(true) {__m_->lock();} : __m_(_VSTD::addressof(__m)), __owns_(true) {__m_->lock();}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
unique_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT unique_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT
: __m_(addressof(__m)), __owns_(false) {} : __m_(_VSTD::addressof(__m)), __owns_(false) {}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
unique_lock(mutex_type& __m, try_to_lock_t) unique_lock(mutex_type& __m, try_to_lock_t)
: __m_(addressof(__m)), __owns_(__m.try_lock()) {} : __m_(_VSTD::addressof(__m)), __owns_(__m.try_lock()) {}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
unique_lock(mutex_type& __m, adopt_lock_t) unique_lock(mutex_type& __m, adopt_lock_t)
: __m_(addressof(__m)), __owns_(true) {} : __m_(_VSTD::addressof(__m)), __owns_(true) {}
template <class _Clock, class _Duration> template <class _Clock, class _Duration>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
unique_lock(mutex_type& __m, const chrono::time_point<_Clock, _Duration>& __t) unique_lock(mutex_type& __m, const chrono::time_point<_Clock, _Duration>& __t)
: __m_(addressof(__m)), __owns_(__m.try_lock_until(__t)) {} : __m_(_VSTD::addressof(__m)), __owns_(__m.try_lock_until(__t)) {}
template <class _Rep, class _Period> template <class _Rep, class _Period>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
unique_lock(mutex_type& __m, const chrono::duration<_Rep, _Period>& __d) unique_lock(mutex_type& __m, const chrono::duration<_Rep, _Period>& __d)
: __m_(addressof(__m)), __owns_(__m.try_lock_for(__d)) {} : __m_(_VSTD::addressof(__m)), __owns_(__m.try_lock_for(__d)) {}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
~unique_lock() ~unique_lock()
{ {

12
include/shared_mutex
View File

@@ -319,25 +319,25 @@ public:
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
explicit shared_lock(mutex_type& __m) explicit shared_lock(mutex_type& __m)
: __m_(addressof(__m)), : __m_(_VSTD::addressof(__m)),
__owns_(true) __owns_(true)
{__m_->lock_shared();} {__m_->lock_shared();}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
shared_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT shared_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT
: __m_(addressof(__m)), : __m_(_VSTD::addressof(__m)),
__owns_(false) __owns_(false)
{} {}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
shared_lock(mutex_type& __m, try_to_lock_t) shared_lock(mutex_type& __m, try_to_lock_t)
: __m_(addressof(__m)), : __m_(_VSTD::addressof(__m)),
__owns_(__m.try_lock_shared()) __owns_(__m.try_lock_shared())
{} {}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
shared_lock(mutex_type& __m, adopt_lock_t) shared_lock(mutex_type& __m, adopt_lock_t)
: __m_(addressof(__m)), : __m_(_VSTD::addressof(__m)),
__owns_(true) __owns_(true)
{} {}
@@ -345,7 +345,7 @@ public:
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
shared_lock(mutex_type& __m, shared_lock(mutex_type& __m,
const chrono::time_point<_Clock, _Duration>& __abs_time) const chrono::time_point<_Clock, _Duration>& __abs_time)
: __m_(addressof(__m)), : __m_(_VSTD::addressof(__m)),
__owns_(__m.try_lock_shared_until(__abs_time)) __owns_(__m.try_lock_shared_until(__abs_time))
{} {}
@@ -353,7 +353,7 @@ public:
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
shared_lock(mutex_type& __m, shared_lock(mutex_type& __m,
const chrono::duration<_Rep, _Period>& __rel_time) const chrono::duration<_Rep, _Period>& __rel_time)
: __m_(addressof(__m)), : __m_(_VSTD::addressof(__m)),
__owns_(__m.try_lock_shared_for(__rel_time)) __owns_(__m.try_lock_shared_for(__rel_time))
{} {}