diff options
| author | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
| commit | f8db8a3faa30b71dca33ced38be16d3f93f43e8a (patch) | |
| tree | 3b798318132cca7eccfbca5818ab55656a2896d7 /platform/android/thread_jandroid.h | |
| parent | 1d418afe863c9e553b69174ce63aef203c46d2f0 (diff) | |
| download | godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.gz godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.zst godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.zip | |
Bring that Whole New World to the Old Continent too
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6e3e905b94b8764e99491e608122261.
Diffstat (limited to 'platform/android/thread_jandroid.h')
| -rw-r--r-- | platform/android/thread_jandroid.h | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/platform/android/thread_jandroid.h b/platform/android/thread_jandroid.h index 6f52b730f..a8d8a4d8b 100644 --- a/platform/android/thread_jandroid.h +++ b/platform/android/thread_jandroid.h @@ -33,11 +33,10 @@ @author Juan Linietsky <reduzio@gmail.com> */ - -#include <sys/types.h> -#include <pthread.h> #include "os/thread.h" #include <jni.h> +#include <pthread.h> +#include <sys/types.h> class ThreadAndroid : public Thread { @@ -47,36 +46,28 @@ class ThreadAndroid : public Thread { void *user; ID id; - static Thread* create_thread_jandroid(); - + static Thread *create_thread_jandroid(); static void *thread_callback(void *userdata); - static Thread* create_func_jandroid(ThreadCreateCallback p_callback,void *,const Settings&); + static Thread *create_func_jandroid(ThreadCreateCallback p_callback, void *, const Settings &); static ID get_thread_ID_func_jandroid(); - static void wait_to_finish_func_jandroid(Thread* p_thread); + static void wait_to_finish_func_jandroid(Thread *p_thread); - static void _thread_destroyed(void* value); + static void _thread_destroyed(void *value); ThreadAndroid(); static pthread_key_t jvm_key; - static JavaVM* java_vm; -public: - - - + static JavaVM *java_vm; +public: virtual ID get_ID() const; - static void make_default(JavaVM* p_java_vm); + static void make_default(JavaVM *p_java_vm); static void setup_thread(); static JNIEnv *get_env(); - ~ThreadAndroid(); - }; - - #endif |