aboutsummaryrefslogtreecommitdiff
path: root/core/os/thread.cpp
diff options
context:
space:
mode:
authorRémi Verschelde2016-03-09 00:14:08 +0100
committerRémi Verschelde2016-03-09 00:14:08 +0100
commite46e43d2aaa6339a1675eb989f41885e745bf5c3 (patch)
treecf91f2869ff8f058c6682569fb31e22e5ee736ad /core/os/thread.cpp
parent1dad6eca812e5c2e313b54265114de8a1d73d999 (diff)
parent4a4f2479146aa33e235ed57cde311efda68d3c8f (diff)
downloadgodot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.gz
godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.zst
godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.zip
Merge pull request #3928 from Marqin/whitespace
remove trailing whitespace - sorry for the broken PRs, please rebase :)
Diffstat (limited to '')
-rw-r--r--core/os/thread.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/os/thread.cpp b/core/os/thread.cpp
index f5d984876..c1ae53074 100644
--- a/core/os/thread.cpp
+++ b/core/os/thread.cpp
@@ -37,26 +37,26 @@ Error (*Thread::set_name_func)(const String&)=NULL;
Thread::ID Thread::_main_thread_id=0;
Thread::ID Thread::get_caller_ID() {
-
+
if (get_thread_ID_func)
return get_thread_ID_func();
return 0;
}
Thread* Thread::create(ThreadCreateCallback p_callback,void * p_user,const Settings& p_settings) {
-
+
if (create_func) {
-
+
return create_func(p_callback,p_user,p_settings);
}
return NULL;
}
void Thread::wait_to_finish(Thread *p_thread) {
-
+
if (wait_to_finish_func)
wait_to_finish_func(p_thread);
-
+
}
Error Thread::set_name(const String &p_name) {