Merge branch 'Vita3K:master' into master

backgamon · May 14, 2024 · 189ccbb · 189ccbb
2 parents f734baf + d4c0c49
commit 189ccbb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/external/tracy b/external/tracy
diff --git a/vita3k/kernel/include/kernel/thread/thread_data_queue.h b/vita3k/kernel/include/kernel/thread/thread_data_queue.h
@@ -18,6 +18,8 @@
 #pragma once
 
 #include <kernel/thread/thread_state.h>
+
+#include <algorithm>
 #include <list>
 #include <set>
 

diff --git a/vita3k/mem/include/mem/mempool.h b/vita3k/mem/include/mem/mempool.h
@@ -20,6 +20,8 @@
 #include <mem/ptr.h>
 #include <util/align.h>
 
+#include <algorithm>
+
 struct MemspaceBlockAllocator {
     struct Block {
         std::uint32_t size;