diff options
| author | Per Larsson <[email protected]> | 2021-11-01 14:36:39 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-11-01 14:36:39 +0100 |
| commit | ff676a3e570563b2de32b61563b46a828437e4aa (patch) | |
| tree | 2c7799b8f525c26f18b1cccfaeefa8355f0f9798 /zencore | |
| parent | Upload cache record before blobs and call finalize when processing upstream t... (diff) | |
| parent | Moved declaration of ZenDiskCacheLayer::CacheBucket in the .h (diff) | |
| download | zen-ff676a3e570563b2de32b61563b46a828437e4aa.tar.xz zen-ff676a3e570563b2de32b61563b46a828437e4aa.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/filesystem.cpp | 2 | ||||
| -rw-r--r-- | zencore/include/zencore/sharedbuffer.h | 6 | ||||
| -rw-r--r-- | zencore/memory.cpp | 4 | ||||
| -rw-r--r-- | zencore/xmake.lua | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/zencore/filesystem.cpp b/zencore/filesystem.cpp index b8e8eff55..a642e2cf6 100644 --- a/zencore/filesystem.cpp +++ b/zencore/filesystem.cpp @@ -840,7 +840,7 @@ TEST_CASE("filesystem") // GetExePath -- this is not a great test as it's so dependent on where the this code gets linked in path BinPath = GetRunningExecutablePath(); - const bool ExpectedExe = BinPath.stem() == "zencore-test" || BinPath.stem() == "zenserver-test" || BinPath.stem() == "zenstore-test"; + const bool ExpectedExe = ToUtf8(BinPath.stem().native()).ends_with("-test"sv) || BinPath.stem() == "zenserver"; CHECK(ExpectedExe); CHECK(is_regular_file(BinPath)); diff --git a/zencore/include/zencore/sharedbuffer.h b/zencore/include/zencore/sharedbuffer.h index 640c3fe74..1f87dc639 100644 --- a/zencore/include/zencore/sharedbuffer.h +++ b/zencore/include/zencore/sharedbuffer.h @@ -143,6 +143,12 @@ public: /** Make a non-owned view of the input */ [[nodiscard]] inline static SharedBuffer MakeView(MemoryView View) { return MakeView(View.GetData(), View.GetSize()); } + /** Make a non-owning view of the memory of the contiguous container. */ + [[nodiscard]] inline static SharedBuffer MakeView(const std::ranges::contiguous_range auto& Container) + { + std::span Span = Container; + return MakeView(Span.data(), Span.size() * sizeof(typename decltype(Span)::element_type)); + } /** Make a non-owned view of the input */ [[nodiscard]] ZENCORE_API static SharedBuffer MakeView(const void* Data, uint64_t Size); /** Make a non-owned view of the input */ diff --git a/zencore/memory.cpp b/zencore/memory.cpp index 62c81076d..14ea7ca1d 100644 --- a/zencore/memory.cpp +++ b/zencore/memory.cpp @@ -185,13 +185,13 @@ TEST_CASE("ChunkingLinearAllocator") TEST_CASE("MemoryView") { { - uint8_t Array1[16]; + uint8_t Array1[16] = {}; MemoryView View1 = MakeMemoryView(Array1); CHECK(View1.GetSize() == 16); } { - uint32_t Array2[16]; + uint32_t Array2[16] = {}; MemoryView View2 = MakeMemoryView(Array2); CHECK(View2.GetSize() == 64); } diff --git a/zencore/xmake.lua b/zencore/xmake.lua index 5de7f476d..0b0b51758 100644 --- a/zencore/xmake.lua +++ b/zencore/xmake.lua @@ -8,7 +8,9 @@ target('zencore') "vcpkg::spdlog", "vcpkg::fmt", "vcpkg::doctest", + "vcpkg::json11", "vcpkg::lz4", + "vcpkg::mimalloc", "vcpkg::cpr", "vcpkg::curl", -- required by cpr "vcpkg::zlib", -- required by curl |