From b044289e3c8fbc4eb4ffa5c1d96da51aa0a41f9b Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Thu, 6 Mar 2025 17:35:39 +0100 Subject: std::span -> eastl::span --- src/zenstore/gc.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/zenstore/gc.cpp') diff --git a/src/zenstore/gc.cpp b/src/zenstore/gc.cpp index 258ec80ca..b158c97aa 100644 --- a/src/zenstore/gc.cpp +++ b/src/zenstore/gc.cpp @@ -581,8 +581,8 @@ FilterReferences(GcCtx& Ctx, std::string_view Context, eastl::vector& In return true; } -std::span -KeepUnusedReferences(std::span SortedUsedReferences, std::span SortedReferences) +eastl::span +KeepUnusedReferences(eastl::span SortedUsedReferences, eastl::span SortedReferences) { if (SortedUsedReferences.empty()) { @@ -1166,8 +1166,8 @@ GcManager::CollectGarbage(const GcSettings& Settings) { ZEN_TRACE_CPU("GcV2::RemoveUnreferencedData"); - const auto GetUnusedReferences = [&ReferenceCheckers, &Ctx](std::span References) -> std::span { - std::span UnusedCids(References); + const auto GetUnusedReferences = [&ReferenceCheckers, &Ctx](eastl::span References) -> eastl::span { + eastl::span UnusedCids(References); ZEN_ASSERT(UnusedCids.empty() || UnusedCids[0] != IoHash::Zero); for (const auto& It : ReferenceCheckers) { @@ -2852,35 +2852,35 @@ TEST_CASE("gc.keepunusedreferences") { eastl::vector UsedReferences; eastl::vector References; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.empty()); } { eastl::vector UsedReferences{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; eastl::vector References; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.empty()); } { eastl::vector UsedReferences{}; eastl::vector References{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.size() == 5); } { eastl::vector UsedReferences{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; eastl::vector References{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.empty()); } { eastl::vector UsedReferences{Hashes[0], Hashes[2], Hashes[4]}; eastl::vector References{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.size() == 2); CHECK(UnusedReferences[0] == Hashes[1]); CHECK(UnusedReferences[1] == Hashes[3]); @@ -2889,7 +2889,7 @@ TEST_CASE("gc.keepunusedreferences") { eastl::vector UsedReferences{Hashes[2], Hashes[3], Hashes[4]}; eastl::vector References{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.size() == 2); CHECK(UnusedReferences[0] == Hashes[0]); CHECK(UnusedReferences[1] == Hashes[1]); @@ -2898,7 +2898,7 @@ TEST_CASE("gc.keepunusedreferences") { eastl::vector UsedReferences{Hashes[0], Hashes[1], Hashes[2]}; eastl::vector References{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.size() == 2); CHECK(UnusedReferences[0] == Hashes[3]); CHECK(UnusedReferences[1] == Hashes[4]); @@ -2907,7 +2907,7 @@ TEST_CASE("gc.keepunusedreferences") { eastl::vector UsedReferences{Hashes[0], Hashes[1], Hashes[2], Hashes[4]}; eastl::vector References{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.size() == 1); CHECK(UnusedReferences[0] == Hashes[3]); } @@ -2915,7 +2915,7 @@ TEST_CASE("gc.keepunusedreferences") { eastl::vector UsedReferences{Hashes[1], Hashes[3]}; eastl::vector References{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.size() == 3); CHECK(UnusedReferences[0] == Hashes[0]); CHECK(UnusedReferences[1] == Hashes[2]); @@ -2925,7 +2925,7 @@ TEST_CASE("gc.keepunusedreferences") { eastl::vector UsedReferences{Hashes[0]}; eastl::vector References{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.size() == 4); CHECK(UnusedReferences[0] == Hashes[1]); CHECK(UnusedReferences[1] == Hashes[2]); @@ -2936,7 +2936,7 @@ TEST_CASE("gc.keepunusedreferences") { eastl::vector UsedReferences{Hashes[1]}; eastl::vector References{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.size() == 4); CHECK(UnusedReferences[0] == Hashes[0]); CHECK(UnusedReferences[1] == Hashes[2]); @@ -2947,7 +2947,7 @@ TEST_CASE("gc.keepunusedreferences") { eastl::vector UsedReferences{Hashes[3]}; eastl::vector References{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.size() == 4); CHECK(UnusedReferences[0] == Hashes[0]); CHECK(UnusedReferences[1] == Hashes[1]); @@ -2958,7 +2958,7 @@ TEST_CASE("gc.keepunusedreferences") { eastl::vector UsedReferences{Hashes[4]}; eastl::vector References{Hashes[0], Hashes[1], Hashes[2], Hashes[3], Hashes[4]}; - std::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); + eastl::span UnusedReferences = KeepUnusedReferences(UsedReferences, References); CHECK(UnusedReferences.size() == 4); CHECK(UnusedReferences[0] == Hashes[0]); CHECK(UnusedReferences[1] == Hashes[1]); -- cgit v1.2.3