diff options
| author | Martin Ridgers <[email protected]> | 2021-09-21 11:06:13 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-09-21 11:06:13 +0200 |
| commit | 68c951e0f440ffd483795dced737e88152c1a581 (patch) | |
| tree | 5c0910ca2a85b45fb05dba3ce457b7d156213894 /zencore/compositebuffer.cpp | |
| parent | Merge main into linux-mac (diff) | |
| parent | Trigger storage scrubbing pass at startup (diff) | |
| download | zen-68c951e0f440ffd483795dced737e88152c1a581.tar.xz zen-68c951e0f440ffd483795dced737e88152c1a581.zip | |
Merged main into linux-mac
Diffstat (limited to 'zencore/compositebuffer.cpp')
| -rw-r--r-- | zencore/compositebuffer.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/zencore/compositebuffer.cpp b/zencore/compositebuffer.cpp index 9349c014f..3190ca5ea 100644 --- a/zencore/compositebuffer.cpp +++ b/zencore/compositebuffer.cpp @@ -3,8 +3,7 @@ #include <zencore/compositebuffer.h> #include <zencore/sharedbuffer.h> - -#include <doctest/doctest.h> +#include <zencore/testing.h> namespace zen { @@ -91,8 +90,8 @@ CompositeBuffer CompositeBuffer::Mid(uint64_t Offset, uint64_t Size) const { const uint64_t BufferSize = GetSize(); - Offset = zen::Min(Offset, BufferSize); - Size = zen::Min(Size, BufferSize - Offset); + Offset = Min(Offset, BufferSize); + Size = Min(Size, BufferSize - Offset); CompositeBuffer Buffer; IterateRange(Offset, Size, [&Buffer](MemoryView View, const SharedBuffer& ViewOuter) { Buffer.m_Segments.push_back(SharedBuffer::MakeView(View, ViewOuter)); @@ -168,6 +167,7 @@ CompositeBuffer::IterateRange(uint64_t Offset, } } +#if ZEN_WITH_TESTS TEST_CASE("CompositeBuffer Null") { CompositeBuffer Buffer; @@ -337,5 +337,6 @@ void compositebuffer_forcelink() { } +#endif } // namespace zen |