diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-07 14:59:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 14:59:39 +0200 |
| commit | 3121b3a4f4c01744184e952d79f9a56e01bdba41 (patch) | |
| tree | 689fe41108d8d35c2aaace270c265085fac310d7 /platform/android/thread_jandroid.cpp | |
| parent | b0dfec77c27fb413eeaf3b9b2fdcb3777526c28f (diff) | |
| parent | 5ae78fdf6adf4b3ab417d2b6fd5a41bfa6d5cfe2 (diff) | |
Merge pull request #10141 from ISylvox/lower_case_godot_api
Makes all Godot API's Methods lower_case
Diffstat (limited to 'platform/android/thread_jandroid.cpp')
| -rw-r--r-- | platform/android/thread_jandroid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/thread_jandroid.cpp b/platform/android/thread_jandroid.cpp index 401f3cd73b..924ae3fe43 100644 --- a/platform/android/thread_jandroid.cpp +++ b/platform/android/thread_jandroid.cpp @@ -32,7 +32,7 @@ #include "os/memory.h" #include "script_language.h" -Thread::ID ThreadAndroid::get_ID() const { +Thread::ID ThreadAndroid::get_id() const { return id; } @@ -66,7 +66,7 @@ Thread *ThreadAndroid::create_func_jandroid(ThreadCreateCallback p_callback, voi return tr; } -Thread::ID ThreadAndroid::get_thread_ID_func_jandroid() { +Thread::ID ThreadAndroid::get_thread_id_func_jandroid() { return (ID)pthread_self(); } @@ -107,7 +107,7 @@ void ThreadAndroid::make_default(JavaVM *p_java_vm) { java_vm = p_java_vm; create_func = create_func_jandroid; - get_thread_ID_func = get_thread_ID_func_jandroid; + get_thread_id_func = get_thread_id_func_jandroid; wait_to_finish_func = wait_to_finish_func_jandroid; pthread_key_create(&jvm_key, _thread_destroyed); setup_thread(); |