diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 15:56:02 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 15:56:02 -0800 |
| commit | e0268fa1035a718341c53921eee9318d4a8033cd (patch) | |
| tree | 2b3eeb07928f9521498332002444dbfa44f34dfb /system/include/libcxx/__mutex_base | |
| parent | a11272805c16be75f5e6d00c8214afcac7ba9d05 (diff) | |
| parent | ad1da1e6685d4483e096d7e0bbd8e38e686bd322 (diff) | |
Merge pull request #1767 from waywardmonkeys/update-libcxx1.7.2
Update libcxx
Diffstat (limited to 'system/include/libcxx/__mutex_base')
| -rw-r--r-- | system/include/libcxx/__mutex_base | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/system/include/libcxx/__mutex_base b/system/include/libcxx/__mutex_base index 0583df93..d4023a64 100644 --- a/system/include/libcxx/__mutex_base +++ b/system/include/libcxx/__mutex_base @@ -20,16 +20,6 @@ #pragma GCC system_header #endif -#ifdef _LIBCPP_SHARED_LOCK - -namespace ting { -template <class _Mutex> class shared_lock; -template <class _Mutex> class upgrade_lock; -} - -#endif // _LIBCPP_SHARED_LOCK - - _LIBCPP_BEGIN_NAMESPACE_STD class _LIBCPP_TYPE_VIS mutex @@ -77,7 +67,7 @@ constexpr adopt_lock_t adopt_lock = adopt_lock_t(); #endif template <class _Mutex> -class _LIBCPP_TYPE_VIS lock_guard +class _LIBCPP_TYPE_VIS_ONLY lock_guard { public: typedef _Mutex mutex_type; @@ -101,7 +91,7 @@ private: }; template <class _Mutex> -class _LIBCPP_TYPE_VIS unique_lock +class _LIBCPP_TYPE_VIS_ONLY unique_lock { public: typedef _Mutex mutex_type; @@ -162,27 +152,6 @@ public: return *this; } -#ifdef _LIBCPP_SHARED_LOCK - - unique_lock(ting::shared_lock<mutex_type>&&, try_to_lock_t); - template <class _Clock, class _Duration> - unique_lock(ting::shared_lock<mutex_type>&&, - const chrono::time_point<_Clock, _Duration>&); - template <class _Rep, class _Period> - unique_lock(ting::shared_lock<mutex_type>&&, - const chrono::duration<_Rep, _Period>&); - - explicit unique_lock(ting::upgrade_lock<mutex_type>&&); - unique_lock(ting::upgrade_lock<mutex_type>&&, try_to_lock_t); - template <class _Clock, class _Duration> - unique_lock(ting::upgrade_lock<mutex_type>&&, - const chrono::time_point<_Clock, _Duration>&); - template <class _Rep, class _Period> - unique_lock(ting::upgrade_lock<mutex_type>&&, - const chrono::duration<_Rep, _Period>&); - -#endif // _LIBCPP_SHARED_LOCK - #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES void lock(); |