diff options
| author | Stefan Boberg <[email protected]> | 2021-05-21 20:40:28 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-05-21 20:40:28 +0200 |
| commit | 3bfae8dbf3ecf0527ea2ec09b09e83ce894adecf (patch) | |
| tree | 6b64c1d28c75f2130be85391d122c00687362d1c /zencore | |
| parent | Moved CasBlobFile into basicfile.h (diff) | |
| download | zen-3bfae8dbf3ecf0527ea2ec09b09e83ce894adecf.tar.xz zen-3bfae8dbf3ecf0527ea2ec09b09e83ce894adecf.zip | |
std::min -> zen::Min
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/include/zencore/memory.h | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |