aboutsummaryrefslogtreecommitdiff
path: root/core/os/thread.cpp
diff options
context:
space:
mode:
authorIndah Sylvia2017-08-07 17:17:31 +0700
committerIndah Sylvia2017-08-07 18:24:35 +0700
commit5ae78fdf6adf4b3ab417d2b6fd5a41bfa6d5cfe2 (patch)
tree3f0dcef53a38d356a40fd7adce40387f21904a18 /core/os/thread.cpp
parent7e4970214c92fec0e7262f36765764a81e28b2be (diff)
downloadgodot-5ae78fdf6adf4b3ab417d2b6fd5a41bfa6d5cfe2.tar.gz
godot-5ae78fdf6adf4b3ab417d2b6fd5a41bfa6d5cfe2.tar.zst
godot-5ae78fdf6adf4b3ab417d2b6fd5a41bfa6d5cfe2.zip
Diffstat (limited to 'core/os/thread.cpp')
-rw-r--r--core/os/thread.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/os/thread.cpp b/core/os/thread.cpp
index 98f196862..bd565334c 100644
--- a/core/os/thread.cpp
+++ b/core/os/thread.cpp
@@ -30,16 +30,16 @@
#include "thread.h"
Thread *(*Thread::create_func)(ThreadCreateCallback, void *, const Settings &) = NULL;
-Thread::ID (*Thread::get_thread_ID_func)() = NULL;
+Thread::ID (*Thread::get_thread_id_func)() = NULL;
void (*Thread::wait_to_finish_func)(Thread *) = NULL;
Error (*Thread::set_name_func)(const String &) = NULL;
Thread::ID Thread::_main_thread_id = 0;
-Thread::ID Thread::get_caller_ID() {
+Thread::ID Thread::get_caller_id() {
- if (get_thread_ID_func)
- return get_thread_ID_func();
+ if (get_thread_id_func)
+ return get_thread_id_func();
return 0;
}