aboutsummaryrefslogtreecommitdiff
path: root/zencore/memory.cpp
diff options
context:
space:
mode:
authorPer Larsson <[email protected]>2021-09-20 10:28:38 +0200
committerPer Larsson <[email protected]>2021-09-20 10:28:38 +0200
commitd7e8b3f1435ba50f50393692763508f3224aa9b1 (patch)
treeee4357d70cdb9ea1fbcc3836d859cf39fe8e2f42 /zencore/memory.cpp
parentAdded support for skipping package attachments. (diff)
parenttrivial: include cleanup (diff)
downloadzen-d7e8b3f1435ba50f50393692763508f3224aa9b1.tar.xz
zen-d7e8b3f1435ba50f50393692763508f3224aa9b1.zip
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zencore/memory.cpp')
-rw-r--r--zencore/memory.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/zencore/memory.cpp b/zencore/memory.cpp
index 26c8321e5..613b6ba67 100644
--- a/zencore/memory.cpp
+++ b/zencore/memory.cpp
@@ -2,6 +2,7 @@
#include <zencore/intmath.h>
#include <zencore/memory.h>
+#include <zencore/testing.h>
#ifdef ZEN_PLATFORM_WINDOWS
# include <malloc.h>
@@ -9,8 +10,6 @@
# include <cstdlib>
#endif
-#include <doctest/doctest.h>
-
namespace zen {
//////////////////////////////////////////////////////////////////////////
@@ -147,6 +146,8 @@ ChunkingLinearAllocator::Alloc(size_t Size, size_t Alignment)
// Unit tests
//
+#if ZEN_WITH_TESTS
+
TEST_CASE("ChunkingLinearAllocator")
{
ChunkingLinearAllocator Allocator(4096);
@@ -194,4 +195,6 @@ memory_forcelink()
{
}
+#endif
+
} // namespace zen