diff options
| author | Rémi Verschelde | 2016-11-06 12:03:10 +0100 |
|---|---|---|
| committer | GitHub | 2016-11-06 12:03:10 +0100 |
| commit | be4eff1d8b0b87f81be56d8cf166bcc209205638 (patch) | |
| tree | 437a4c3495753de1528653a82a5bd094193061e7 /platform/uwp/thread_uwp.cpp | |
| parent | 20a33e809e5968f915021d162db955e207c8e7b7 (diff) | |
| parent | 411faaa6f478f837aa40893eaadf67e2b5d57cec (diff) | |
| download | godot-be4eff1d8b0b87f81be56d8cf166bcc209205638.tar.gz godot-be4eff1d8b0b87f81be56d8cf166bcc209205638.tar.zst godot-be4eff1d8b0b87f81be56d8cf166bcc209205638.zip | |
Merge pull request #7019 from vnen/rename-winrt-uwp
Rename WinRT platform to UWP
Diffstat (limited to '')
| -rw-r--r-- | platform/uwp/thread_uwp.cpp (renamed from platform/winrt/thread_winrt.cpp) | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/platform/winrt/thread_winrt.cpp b/platform/uwp/thread_uwp.cpp index 8e3e0d5be..a5a0920df 100644 --- a/platform/winrt/thread_winrt.cpp +++ b/platform/uwp/thread_uwp.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* thread_winrt.cpp */ +/* thread_uwp.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -26,13 +26,13 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "thread_winrt.h" +#include "thread_uwp.h" #include "os/memory.h" -Thread* ThreadWinrt::create_func_winrt(ThreadCreateCallback p_callback,void *p_user,const Settings&) { +Thread* ThreadUWP::create_func_uwp(ThreadCreateCallback p_callback,void *p_user,const Settings&) { - ThreadWinrt* thread = memnew(ThreadWinrt); + ThreadUWP* thread = memnew(ThreadUWP); std::thread new_thread(p_callback, p_user); @@ -41,34 +41,34 @@ Thread* ThreadWinrt::create_func_winrt(ThreadCreateCallback p_callback,void *p_u return thread; }; -Thread::ID ThreadWinrt::get_thread_ID_func_winrt() { +Thread::ID ThreadUWP::get_thread_ID_func_uwp() { return std::hash<std::thread::id>()(std::this_thread::get_id()); }; -void ThreadWinrt::wait_to_finish_func_winrt(Thread* p_thread) { +void ThreadUWP::wait_to_finish_func_uwp(Thread* p_thread) { - ThreadWinrt *tp=static_cast<ThreadWinrt*>(p_thread); + ThreadUWP *tp=static_cast<ThreadUWP*>(p_thread); tp->thread.join(); }; -Thread::ID ThreadWinrt::get_ID() const { +Thread::ID ThreadUWP::get_ID() const { return std::hash<std::thread::id>()(thread.get_id()); }; -void ThreadWinrt::make_default() { - create_func = create_func_winrt; - get_thread_ID_func = get_thread_ID_func_winrt; - wait_to_finish_func = wait_to_finish_func_winrt; +void ThreadUWP::make_default() { + create_func = create_func_uwp; + get_thread_ID_func = get_thread_ID_func_uwp; + wait_to_finish_func = wait_to_finish_func_uwp; }; -ThreadWinrt::ThreadWinrt() { +ThreadUWP::ThreadUWP() { }; -ThreadWinrt::~ThreadWinrt() { +ThreadUWP::~ThreadUWP() { }; |
