diff options
| author | joerg <joerg@NetBSD.org> | 2014-05-15 23:53:10 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2014-05-15 23:53:10 +0000 |
| commit | 7972508cd3db7ea3857a7e0059b22fd1910c8fe9 (patch) | |
| tree | 63e5b91bb65ab436a5830f5d645f1898ba894137 /external/bsd/libc++/dist/libcxx/src/shared_mutex.cpp | |
| parent | 83e01ae981d66c58f51d55caa1ed318ff54cc6aa (diff) | |
Import libc++ r208870. Improves const use, fixes a few cases of missing
assign-to-self support and increase support for GCC.
Diffstat (limited to 'external/bsd/libc++/dist/libcxx/src/shared_mutex.cpp')
| -rw-r--r-- | external/bsd/libc++/dist/libcxx/src/shared_mutex.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/external/bsd/libc++/dist/libcxx/src/shared_mutex.cpp b/external/bsd/libc++/dist/libcxx/src/shared_mutex.cpp index 5fb22e44544..dd78a1647fe 100644 --- a/external/bsd/libc++/dist/libcxx/src/shared_mutex.cpp +++ b/external/bsd/libc++/dist/libcxx/src/shared_mutex.cpp @@ -12,7 +12,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -shared_mutex::shared_mutex() +shared_timed_mutex::shared_timed_mutex() : __state_(0) { } @@ -20,7 +20,7 @@ shared_mutex::shared_mutex() // Exclusive ownership void -shared_mutex::lock() +shared_timed_mutex::lock() { unique_lock<mutex> lk(__mut_); while (__state_ & __write_entered_) @@ -31,7 +31,7 @@ shared_mutex::lock() } bool -shared_mutex::try_lock() +shared_timed_mutex::try_lock() { unique_lock<mutex> lk(__mut_); if (__state_ == 0) @@ -43,7 +43,7 @@ shared_mutex::try_lock() } void -shared_mutex::unlock() +shared_timed_mutex::unlock() { lock_guard<mutex> _(__mut_); __state_ = 0; @@ -53,7 +53,7 @@ shared_mutex::unlock() // Shared ownership void -shared_mutex::lock_shared() +shared_timed_mutex::lock_shared() { unique_lock<mutex> lk(__mut_); while ((__state_ & __write_entered_) || (__state_ & __n_readers_) == __n_readers_) @@ -64,7 +64,7 @@ shared_mutex::lock_shared() } bool -shared_mutex::try_lock_shared() +shared_timed_mutex::try_lock_shared() { unique_lock<mutex> lk(__mut_); unsigned num_readers = __state_ & __n_readers_; @@ -79,7 +79,7 @@ shared_mutex::try_lock_shared() } void -shared_mutex::unlock_shared() +shared_timed_mutex::unlock_shared() { lock_guard<mutex> _(__mut_); unsigned num_readers = (__state_ & __n_readers_) - 1; |
