diff options
author | David Majnemer <david.majnemer@gmail.com> | 2014-03-17 20:19:44 +0000 |
---|---|---|
committer | David Majnemer <david.majnemer@gmail.com> | 2014-03-17 20:19:44 +0000 |
commit | 7ec93f9b1c17c389a3e8a78c43f4178aa9ed1e72 (patch) | |
tree | 64f42a233e77c43c5b2084ab59ef5378d7302b6e /libcxx/src | |
parent | 2fd6f512e5850beba380424f8cf677d452bd0f63 (diff) | |
download | bcm5719-llvm-7ec93f9b1c17c389a3e8a78c43f4178aa9ed1e72.tar.gz bcm5719-llvm-7ec93f9b1c17c389a3e8a78c43f4178aa9ed1e72.zip |
Implement N3891: A proposal to rename shared_mutex to shared_timed_mutex
This is as straightforward as it sounds, a renamed from shared_mutex to
shared_timed_mutex.
Note that libcxx .dylib and .so files built with c++14 support need to
be rebuilt.
llvm-svn: 204078
Diffstat (limited to 'libcxx/src')
-rw-r--r-- | libcxx/src/shared_mutex.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libcxx/src/shared_mutex.cpp b/libcxx/src/shared_mutex.cpp index 5fb22e44544..dd78a1647fe 100644 --- a/libcxx/src/shared_mutex.cpp +++ b/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; |