From 69f7260514a134dedc4f393d07475e4835ec0ac2 Mon Sep 17 00:00:00 2001 From: Reece Date: Wed, 19 Jan 2022 18:37:00 +0000 Subject: [PATCH] [*] cont --- Include/Aurora/Threading/LockGuard.hpp | 2 +- Include/Aurora/Threading/LockGuardTry.hpp | 2 +- Include/Aurora/Threading/WaitFor.hpp | 2 +- Source/Threading/WaitFor.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Include/Aurora/Threading/LockGuard.hpp b/Include/Aurora/Threading/LockGuard.hpp index 387d2368..90228aa9 100644 --- a/Include/Aurora/Threading/LockGuard.hpp +++ b/Include/Aurora/Threading/LockGuard.hpp @@ -72,7 +72,7 @@ namespace Aurora::Threading } private: - std::conditional_t, T, T*> annoying_; + AuConditional_t, T, T*> annoying_; }; #define AU_LOCK_GUARD(variable) Aurora::Threading::LockGuard AU_CONCAT(__stack_lock, __COUNTER__) (variable); diff --git a/Include/Aurora/Threading/LockGuardTry.hpp b/Include/Aurora/Threading/LockGuardTry.hpp index b915ed85..54c3ec5c 100644 --- a/Include/Aurora/Threading/LockGuardTry.hpp +++ b/Include/Aurora/Threading/LockGuardTry.hpp @@ -82,7 +82,7 @@ namespace Aurora::Threading return bLockSuccessful; } private: - std::conditional_t, T, T*> annoying_; + AuConditional_t, T, T*> annoying_; }; diff --git a/Include/Aurora/Threading/WaitFor.hpp b/Include/Aurora/Threading/WaitFor.hpp index 90b037c3..5b3d68a6 100644 --- a/Include/Aurora/Threading/WaitFor.hpp +++ b/Include/Aurora/Threading/WaitFor.hpp @@ -9,7 +9,7 @@ namespace Aurora::Threading { - using PollCallback_cb = std::function; + using PollCallback_cb = AuFunction; AUKN_SYM bool YieldPollNs(bool permitMultipleContextSwitches, AuUInt64 timeoutNs, PollCallback_cb cb); AUKN_SYM bool YieldPoll(bool permitMultipleContextSwitches, AuUInt64 timeoutMs, PollCallback_cb cb); diff --git a/Source/Threading/WaitFor.cpp b/Source/Threading/WaitFor.cpp index 785f85d4..9e23159b 100644 --- a/Source/Threading/WaitFor.cpp +++ b/Source/Threading/WaitFor.cpp @@ -164,7 +164,7 @@ namespace Aurora::Threading return cb(); } - bool YieldPollNs(bool permitMultipleContextSwitches, AuUInt64 timeoutNs, PollCallback_cb cb) + AUKN_SYM bool YieldPollNs(bool permitMultipleContextSwitches, AuUInt64 timeoutNs, PollCallback_cb cb) { AuUInt64 time = Time::CurrentInternalClockNS(); @@ -193,7 +193,7 @@ namespace Aurora::Threading return false; } - bool YieldPoll(bool permitMultipleContextSwitches, AuUInt64 timeoutMs, PollCallback_cb cb) + AUKN_SYM bool YieldPoll(bool permitMultipleContextSwitches, AuUInt64 timeoutMs, PollCallback_cb cb) { AuUInt64 time = Time::CurrentInternalClockNS(); AuUInt64 timeoutNs = timeoutMs ? (time + (timeoutMs * 1000000)) : 0;