diff options
| author | Rémi Verschelde | 2017-03-05 16:44:50 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-05 16:44:50 +0100 |
| commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
| tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /core/os/mutex.h | |
| parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) | |
| download | godot-5dbf180.tar.gz godot-5dbf180.tar.zst godot-5dbf180.zip | |
A Whole New World (clang-format edition)
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?
I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon
A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format
A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
Diffstat (limited to 'core/os/mutex.h')
| -rw-r--r-- | core/os/mutex.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/core/os/mutex.h b/core/os/mutex.h index a1004965b..8ec4f573b 100644 --- a/core/os/mutex.h +++ b/core/os/mutex.h @@ -31,7 +31,6 @@ #include "error_list.h" - /** * @class Mutex * @author Juan Linietsky @@ -41,18 +40,16 @@ * Lockp( mutex ); */ - class Mutex { protected: - static Mutex* (*create_func)(bool); + static Mutex *(*create_func)(bool); 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, OK on success, ERROR means it can't lock. - 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, OK on success, ERROR means it can't lock. - - static Mutex * create(bool p_recursive=true); ///< Create a mutex + static Mutex *create(bool p_recursive = true); ///< Create a mutex virtual ~Mutex(); }; @@ -60,11 +57,15 @@ public: class MutexLock { Mutex *mutex; -public: - - MutexLock(Mutex* p_mutex) { mutex=p_mutex; if (mutex) mutex->lock(); } - ~MutexLock() { if (mutex) mutex->unlock(); } +public: + MutexLock(Mutex *p_mutex) { + mutex = p_mutex; + if (mutex) mutex->lock(); + } + ~MutexLock() { + if (mutex) mutex->unlock(); + } }; #endif |
