summaryrefslogtreecommitdiffstats
path: root/core/os/thread.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-12-21 09:07:06 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-12-21 09:07:06 -0300
commit15429d6ac95acb044c9eebd64356f33e7e5d14ef (patch)
tree872a375b64d93fd6aaf1239e058a13630c9cfabe /core/os/thread.cpp
parent81f62fb78c7f3c133ef764a99dcdf05077d8ced9 (diff)
parentb2f670ebaefa16b0345f9a7ae825f78dbfdec9f8 (diff)
downloadredot-engine-15429d6ac95acb044c9eebd64356f33e7e5d14ef.tar.gz
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core/os/thread.cpp')
-rw-r--r--core/os/thread.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/os/thread.cpp b/core/os/thread.cpp
index 96b0f561ca..53db62c176 100644
--- a/core/os/thread.cpp
+++ b/core/os/thread.cpp
@@ -58,6 +58,11 @@ void Thread::wait_to_finish(Thread *p_thread) {
}
+Error Thread::set_name(const String &p_name) {
+
+ return ERR_UNAVAILABLE;
+};
+
Thread::Thread()
{
}