diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2023-11-21 15:44:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 15:44:18 +0100 |
| commit | c2f8fb301537a5d688d201178985963282b4f9c3 (patch) | |
| tree | 6e21f7954af3ef36854f53830519c6b6be8c689f /core/os/os.cpp | |
| parent | fa259a77cd9ea725f22ccfd52d5c228e10358e1d (diff) | |
| parent | fe4850c0d0e8eed3fe851007c667206684aab0fc (diff) | |
| download | redot-engine-c2f8fb301537a5d688d201178985963282b4f9c3.tar.gz | |
Merge pull request #85039 from RandomShaper/mingwthreads
Use mingw-std-threads in MinGW builds
Diffstat (limited to 'core/os/os.cpp')
| -rw-r--r-- | core/os/os.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index c7390f14ff..f5d55ca107 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -39,7 +39,15 @@ #include "core/version_generated.gen.h" #include <stdarg.h> + +#ifdef MINGW_ENABLED +#define MINGW_STDTHREAD_REDUNDANCY_WARNING +#include "thirdparty/mingw-std-threads/mingw.thread.h" +#define THREADING_NAMESPACE mingw_stdthread +#else #include <thread> +#define THREADING_NAMESPACE std +#endif OS *OS::singleton = nullptr; uint64_t OS::target_ticks = 0; @@ -359,7 +367,7 @@ String OS::get_unique_id() const { } int OS::get_processor_count() const { - return std::thread::hardware_concurrency(); + return THREADING_NAMESPACE::thread::hardware_concurrency(); } String OS::get_processor_name() const { |