From 4a3895c0addb8b8c39c2dabf8a839b8150b55331 Mon Sep 17 00:00:00 2001
From: Patrick Wuttke <p.wuttke@dsfishlabs.com>
Date: Tue, 28 Oct 2025 11:58:30 +0100
Subject: [PATCH] Some minor fixes/adjustments for coroutines.

---
 source/mijin/async/coroutine.hpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/source/mijin/async/coroutine.hpp b/source/mijin/async/coroutine.hpp
index 2711113..3111b01 100644
--- a/source/mijin/async/coroutine.hpp
+++ b/source/mijin/async/coroutine.hpp
@@ -191,10 +191,10 @@ struct TaskReturn<void, TPromise>
 };
 }
 
-template<typename TValue, template<typename> typename TAllocator = MIJIN_DEFAULT_ALLOCATOR>
+template<typename TValue = void, template<typename> typename TAllocator = MIJIN_DEFAULT_ALLOCATOR>
 using TaskFuture = Future<TValue, TAllocator, MIJIN_COROUTINE_ENABLE_EXCEPTIONS>;
 
-template<typename TValue, template<typename> typename TAllocator = MIJIN_DEFAULT_ALLOCATOR>
+template<typename TValue = void, template<typename> typename TAllocator = MIJIN_DEFAULT_ALLOCATOR>
 using TaskFuturePtr = FuturePtr<TValue, TAllocator, MIJIN_COROUTINE_ENABLE_EXCEPTIONS>;
 
 template<typename TValue, template<typename> typename TAllocator>
@@ -964,7 +964,7 @@ template<typename TResult>
 }
 
 template<template<typename> typename TAllocator>
-inline std::suspend_always switchContext(TaskLoop<TAllocator>& taskLoop)
+inline std::suspend_always c_switchContext(TaskLoop<TAllocator>& taskLoop)
 {
     TaskLoop<TAllocator>& currentTaskLoop = TaskLoop<TAllocator>::current();
     if (&currentTaskLoop == &taskLoop) {
@@ -974,6 +974,12 @@ inline std::suspend_always switchContext(TaskLoop<TAllocator>& taskLoop)
     return {};
 }
 
+template<template<typename> typename TAllocator>
+inline std::suspend_always switchContext(TaskLoop<TAllocator>& taskLoop)
+{
+    return c_switchContext(taskLoop);
+}
+
 template<template<typename> typename TAllocator>
 void BaseSimpleTaskLoop<TAllocator>::transferCurrentTask(TaskLoop<TAllocator>& otherLoop) MIJIN_NOEXCEPT
 {
@@ -1229,7 +1235,7 @@ void BaseMultiThreadedTaskLoop<TAllocator>::workerThread(std::stop_token stopTok
         // run it
         getCurrentTask() = &*task;
         impl::gCurrentTaskState = task->task->sharedState();
-        tickTask(*task);
+        base_t::tickTask(*task);
         getCurrentTask() = nullptr;
         impl::gCurrentTaskState = nullptr;