From 9a3a2b03b8b718409eb26252d742d48091756ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Tue, 3 Mar 2020 09:26:42 +0100 Subject: Drop old semaphore implementation - Removed platform-specific implementations. - Now all semaphores are in-object, unless they need to be conditionally created. - Similarly to `Mutex`, provided a dummy implementation for when `NO_THREADS` is defined. - Similarly to `Mutex`, methods are made `const` for easy use in such contexts. - Language bindings updated: `wait()` and `post()` are now `void`. - Language bindings updated: `try_wait()` added. Bonus: - Rewritten the `#ifdef` in `mutex.h` to meet the code style. --- platform/server/SCsub | 1 - platform/server/os_server.cpp | 4 ---- 2 files changed, 5 deletions(-) (limited to 'platform/server') diff --git a/platform/server/SCsub b/platform/server/SCsub index e8538f03a6..8364164114 100644 --- a/platform/server/SCsub +++ b/platform/server/SCsub @@ -10,7 +10,6 @@ common_server = [\ if sys.platform == "darwin": common_server.append("#platform/osx/crash_handler_osx.mm") - common_server.append("#platform/osx/semaphore_osx.cpp") else: common_server.append("#platform/x11/crash_handler_x11.cpp") diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index 8a66332ff1..3257ec261c 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -68,10 +68,6 @@ void OS_Server::initialize_core() { crash_handler.initialize(); OS_Unix::initialize_core(); - -#ifdef __APPLE__ - SemaphoreOSX::make_default(); -#endif } Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) { -- cgit v1.2.3