diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2016-04-13 17:02:23 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2016-04-13 17:02:23 +0000 |
| commit | 3126c88137e4c9b38bd60af71b906cae4a548be1 (patch) | |
| tree | 3da9f298dc8bb01b99dc9a3f976112f8894fbecd | |
| parent | f6e9b4ec24ced79cbdecec602cb580c70b4ae469 (diff) | |
| download | bcm5719-llvm-3126c88137e4c9b38bd60af71b906cae4a548be1.tar.gz bcm5719-llvm-3126c88137e4c9b38bd60af71b906cae4a548be1.zip | |
Qualify calls to addressof to avoid getting ADL. Fixes PR#27254.
llvm-svn: 266209
| -rw-r--r-- | libcxx/include/__mutex_base | 12 | ||||
| -rw-r--r-- | libcxx/include/shared_mutex | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base index 71d0fa2e846..364c69e45d6 100644 --- a/libcxx/include/__mutex_base +++ b/libcxx/include/__mutex_base @@ -117,24 +117,24 @@ public: unique_lock() _NOEXCEPT : __m_(nullptr), __owns_(false) {} _LIBCPP_INLINE_VISIBILITY explicit unique_lock(mutex_type& __m) - : __m_(addressof(__m)), __owns_(true) {__m_->lock();} + : __m_(_VSTD::addressof(__m)), __owns_(true) {__m_->lock();} _LIBCPP_INLINE_VISIBILITY unique_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT - : __m_(addressof(__m)), __owns_(false) {} + : __m_(_VSTD::addressof(__m)), __owns_(false) {} _LIBCPP_INLINE_VISIBILITY 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 unique_lock(mutex_type& __m, adopt_lock_t) - : __m_(addressof(__m)), __owns_(true) {} + : __m_(_VSTD::addressof(__m)), __owns_(true) {} template <class _Clock, class _Duration> _LIBCPP_INLINE_VISIBILITY 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> _LIBCPP_INLINE_VISIBILITY 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 ~unique_lock() { diff --git a/libcxx/include/shared_mutex b/libcxx/include/shared_mutex index 45e7fd0677a..923fe07ab38 100644 --- a/libcxx/include/shared_mutex +++ b/libcxx/include/shared_mutex @@ -319,25 +319,25 @@ public: _LIBCPP_INLINE_VISIBILITY explicit shared_lock(mutex_type& __m) - : __m_(addressof(__m)), + : __m_(_VSTD::addressof(__m)), __owns_(true) {__m_->lock_shared();} _LIBCPP_INLINE_VISIBILITY shared_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT - : __m_(addressof(__m)), + : __m_(_VSTD::addressof(__m)), __owns_(false) {} _LIBCPP_INLINE_VISIBILITY shared_lock(mutex_type& __m, try_to_lock_t) - : __m_(addressof(__m)), + : __m_(_VSTD::addressof(__m)), __owns_(__m.try_lock_shared()) {} _LIBCPP_INLINE_VISIBILITY shared_lock(mutex_type& __m, adopt_lock_t) - : __m_(addressof(__m)), + : __m_(_VSTD::addressof(__m)), __owns_(true) {} @@ -345,7 +345,7 @@ public: _LIBCPP_INLINE_VISIBILITY shared_lock(mutex_type& __m, const chrono::time_point<_Clock, _Duration>& __abs_time) - : __m_(addressof(__m)), + : __m_(_VSTD::addressof(__m)), __owns_(__m.try_lock_shared_until(__abs_time)) {} @@ -353,7 +353,7 @@ public: _LIBCPP_INLINE_VISIBILITY shared_lock(mutex_type& __m, const chrono::duration<_Rep, _Period>& __rel_time) - : __m_(addressof(__m)), + : __m_(_VSTD::addressof(__m)), __owns_(__m.try_lock_shared_for(__rel_time)) {} |
