diff options
author | sanikoyes <sanikoyes@163.com> | 2014-04-06 21:52:47 +0800 |
---|---|---|
committer | sanikoyes <sanikoyes@163.com> | 2014-04-06 21:52:47 +0800 |
commit | 77a840e350668a9c80b1e63b9b73aac44221c53b (patch) | |
tree | 40d2115e639bdc72a61811ac4f2fb0f04ec8eb7f /core/os/mutex.h | |
parent | 14bbdcb139b35e6d206df1ab3176d34245b72329 (diff) | |
parent | ded365031ede27b7a6efef59bc886343f58d310b (diff) |
Merge branch 'master' into hotfix-android-unicode-ime-input
Diffstat (limited to 'core/os/mutex.h')
-rw-r--r-- | core/os/mutex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/os/mutex.h b/core/os/mutex.h index 512180d6c7..241d70e232 100644 --- a/core/os/mutex.h +++ b/core/os/mutex.h @@ -50,7 +50,7 @@ public: virtual void lock()=0; ///< Lock the mutex, block if locked by someone else virtual void unlock()=0; ///< Unlock the mutex, let other threads continue - virtual Error try_lock()=0; ///< Attempt to lock the mutex, true on success, false means it can't lock. + virtual Error try_lock()=0; ///< Attempt to lock the mutex, OK on success, ERROR means it can't lock. static Mutex * create(bool p_recursive=true); ///< Create a mutex |