diff options
| author | dim <dim@FreeBSD.org> | 2013-04-27 22:47:52 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2013-04-27 22:47:52 +0000 |
| commit | 815a6cc1e325a4e8596b91756039a7d699471b11 (patch) | |
| tree | e5a6a26d0973c6968273f6fabb61cb3d624be555 /contrib/libc++/include/mutex | |
| parent | 1497a98f71419ff66d08ad2b8c90530e65521ac2 (diff) | |
| download | FreeBSD-src-815a6cc1e325a4e8596b91756039a7d699471b11.zip FreeBSD-src-815a6cc1e325a4e8596b91756039a7d699471b11.tar.gz | |
Merge libc++ trunk r180598. Contains several minor cleanups and bug
fixes, no major changes.
MFC after: 2 weeks
Diffstat (limited to 'contrib/libc++/include/mutex')
| -rw-r--r-- | contrib/libc++/include/mutex | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/libc++/include/mutex b/contrib/libc++/include/mutex index ee20f02..e2b5d6b 100644 --- a/contrib/libc++/include/mutex +++ b/contrib/libc++/include/mutex @@ -187,7 +187,7 @@ template<class Callable, class ...Args> _LIBCPP_BEGIN_NAMESPACE_STD -class _LIBCPP_VISIBLE recursive_mutex +class _LIBCPP_TYPE_VIS recursive_mutex { pthread_mutex_t __m_; @@ -209,7 +209,7 @@ public: native_handle_type native_handle() {return &__m_;} }; -class _LIBCPP_VISIBLE timed_mutex +class _LIBCPP_TYPE_VIS timed_mutex { mutex __m_; condition_variable __cv_; @@ -251,7 +251,7 @@ timed_mutex::try_lock_until(const chrono::time_point<_Clock, _Duration>& __t) return false; } -class _LIBCPP_VISIBLE recursive_timed_mutex +class _LIBCPP_TYPE_VIS recursive_timed_mutex { mutex __m_; condition_variable __cv_; @@ -425,7 +425,7 @@ lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3) #endif // _LIBCPP_HAS_NO_VARIADICS -struct _LIBCPP_VISIBLE once_flag; +struct _LIBCPP_TYPE_VIS once_flag; #ifndef _LIBCPP_HAS_NO_VARIADICS @@ -441,7 +441,7 @@ void call_once(once_flag&, _Callable); #endif // _LIBCPP_HAS_NO_VARIADICS -struct _LIBCPP_VISIBLE once_flag +struct _LIBCPP_TYPE_VIS once_flag { _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR |
