From 3bfae8dbf3ecf0527ea2ec09b09e83ce894adecf Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Fri, 21 May 2021 20:40:28 +0200
Subject: std::min -> zen::Min

---
 zencore/include/zencore/memory.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zencore/include/zencore/memory.h b/zencore/include/zencore/memory.h
index 8a16126ef..326e4a498 100644
--- a/zencore/include/zencore/memory.h
+++ b/zencore/include/zencore/memory.h
@@ -5,6 +5,7 @@
 #include "zencore.h"
 
 #include <zencore/thread.h>
+#include <zencore/intmath.h>
 
 #include <algorithm>
 #include <vector>
@@ -83,7 +84,7 @@ struct MutableMemoryView
 	/** Modifies the view by chopping the given number of bytes from the left. */
 	inline void RightChopInline(uint64_t InSize)
 	{
-		const uint64_t Offset = std::min(GetSize(), InSize);
+		const uint64_t Offset = zen::Min(GetSize(), InSize);
 		m_Data				  = GetDataAtOffsetNoCheck(Offset);
 	}
 
-- 
cgit v1.2.3