1 files changed, 35 insertions, 35 deletions

diff --git a/src/zenserver/upstream/upstreamcache.cpp b/src/zenserver/upstream/upstreamcache.cpp
index 5ddc141d4..a54e77103 100644
--- a/src/zenserver/upstream/upstreamcache.cpp
+++ b/src/zenserver/upstream/upstreamcache.cpp
@@ -295,9 +295,9 @@ namespace detail {
 			}
 		}
 
-		virtual GetUpstreamCacheResult GetCacheRecords(std::string_view			   Namespace,
-													   std::span<CacheKeyRequest*> Requests,
-													   OnCacheRecordGetComplete&&  OnComplete) override
+		virtual GetUpstreamCacheResult GetCacheRecords(std::string_view				 Namespace,
+													   eastl::span<CacheKeyRequest*> Requests,
+													   OnCacheRecordGetComplete&&	 OnComplete) override
 		{
 			ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheRecords");
 
@@ -392,9 +392,9 @@ namespace detail {
 			}
 		}
 
-		virtual GetUpstreamCacheResult GetCacheChunks(std::string_view				Namespace,
-													  std::span<CacheChunkRequest*> CacheChunkRequests,
-													  OnCacheChunksGetComplete&&	OnComplete) override final
+		virtual GetUpstreamCacheResult GetCacheChunks(std::string_view				  Namespace,
+													  eastl::span<CacheChunkRequest*> CacheChunkRequests,
+													  OnCacheChunksGetComplete&&	  OnComplete) override final
 		{
 			ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheChunks");
 
@@ -447,9 +447,9 @@ namespace detail {
 			return Result;
 		}
 
-		virtual GetUpstreamCacheResult GetCacheValues(std::string_view				Namespace,
-													  std::span<CacheValueRequest*> CacheValueRequests,
-													  OnCacheValueGetComplete&&		OnComplete) override final
+		virtual GetUpstreamCacheResult GetCacheValues(std::string_view				  Namespace,
+													  eastl::span<CacheValueRequest*> CacheValueRequests,
+													  OnCacheValueGetComplete&&		  OnComplete) override final
 		{
 			ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheValues");
 
@@ -522,9 +522,9 @@ namespace detail {
 			return Result;
 		}
 
-		virtual PutUpstreamCacheResult PutCacheRecord(const UpstreamCacheRecord& CacheRecord,
-													  IoBuffer					 RecordValue,
-													  std::span<IoBuffer const>	 Values) override
+		virtual PutUpstreamCacheResult PutCacheRecord(const UpstreamCacheRecord&  CacheRecord,
+													  IoBuffer					  RecordValue,
+													  eastl::span<IoBuffer const> Values) override
 		{
 			ZEN_TRACE_CPU("Upstream::Jupiter::PutCacheRecord");
 
@@ -646,7 +646,7 @@ namespace detail {
 			double	TotalElapsedSeconds = 0.0;
 
 			std::string_view BlobStoreNamespace = GetActualBlobStoreNamespace(Namespace);
-			const auto		 PutBlobs			= [&](std::span<IoHash> ValueContentIds, std::string& OutReason) -> bool {
+			const auto		 PutBlobs			= [&](eastl::span<IoHash> ValueContentIds, std::string& OutReason) -> bool {
 				for (const IoHash& ValueContentId : ValueContentIds)
 				{
 					IoBuffer BlobBuffer;
@@ -865,9 +865,9 @@ namespace detail {
 			}
 		}
 
-		virtual GetUpstreamCacheResult GetCacheRecords(std::string_view			   Namespace,
-													   std::span<CacheKeyRequest*> Requests,
-													   OnCacheRecordGetComplete&&  OnComplete) override
+		virtual GetUpstreamCacheResult GetCacheRecords(std::string_view				 Namespace,
+													   eastl::span<CacheKeyRequest*> Requests,
+													   OnCacheRecordGetComplete&&	 OnComplete) override
 		{
 			ZEN_TRACE_CPU("Upstream::Zen::GetCacheRecords");
 			ZEN_ASSERT(Requests.size() > 0);
@@ -988,9 +988,9 @@ namespace detail {
 			}
 		}
 
-		virtual GetUpstreamCacheResult GetCacheValues(std::string_view				Namespace,
-													  std::span<CacheValueRequest*> CacheValueRequests,
-													  OnCacheValueGetComplete&&		OnComplete) override final
+		virtual GetUpstreamCacheResult GetCacheValues(std::string_view				  Namespace,
+													  eastl::span<CacheValueRequest*> CacheValueRequests,
+													  OnCacheValueGetComplete&&		  OnComplete) override final
 		{
 			ZEN_TRACE_CPU("Upstream::Zen::GetCacheValues");
 			ZEN_ASSERT(!CacheValueRequests.empty());
@@ -1108,9 +1108,9 @@ namespace detail {
 			return {.Error{.ErrorCode = Result.ErrorCode, .Reason = std::move(Result.Reason)}};
 		}
 
-		virtual GetUpstreamCacheResult GetCacheChunks(std::string_view				Namespace,
-													  std::span<CacheChunkRequest*> CacheChunkRequests,
-													  OnCacheChunksGetComplete&&	OnComplete) override final
+		virtual GetUpstreamCacheResult GetCacheChunks(std::string_view				  Namespace,
+													  eastl::span<CacheChunkRequest*> CacheChunkRequests,
+													  OnCacheChunksGetComplete&&	  OnComplete) override final
 		{
 			ZEN_TRACE_CPU("Upstream::Zen::GetCacheChunks");
 			ZEN_ASSERT(!CacheChunkRequests.empty());
@@ -1244,9 +1244,9 @@ namespace detail {
 			return {.Error{.ErrorCode = Result.ErrorCode, .Reason = std::move(Result.Reason)}};
 		}
 
-		virtual PutUpstreamCacheResult PutCacheRecord(const UpstreamCacheRecord& CacheRecord,
-													  IoBuffer					 RecordValue,
-													  std::span<IoBuffer const>	 Values) override
+		virtual PutUpstreamCacheResult PutCacheRecord(const UpstreamCacheRecord&  CacheRecord,
+													  IoBuffer					  RecordValue,
+													  eastl::span<IoBuffer const> Values) override
 		{
 			ZEN_TRACE_CPU("Upstream::Zen::PutCacheRecord");
 
@@ -1586,9 +1586,9 @@ public:
 		return {};
 	}
 
-	virtual void GetCacheRecords(std::string_view			 Namespace,
-								 std::span<CacheKeyRequest*> Requests,
-								 OnCacheRecordGetComplete&&	 OnComplete) override final
+	virtual void GetCacheRecords(std::string_view			   Namespace,
+								 eastl::span<CacheKeyRequest*> Requests,
+								 OnCacheRecordGetComplete&&	   OnComplete) override final
 	{
 		ZEN_TRACE_CPU("Upstream::GetCacheRecords");
 
@@ -1654,9 +1654,9 @@ public:
 		}
 	}
 
-	virtual void GetCacheChunks(std::string_view			  Namespace,
-								std::span<CacheChunkRequest*> CacheChunkRequests,
-								OnCacheChunksGetComplete&&	  OnComplete) override final
+	virtual void GetCacheChunks(std::string_view				Namespace,
+								eastl::span<CacheChunkRequest*> CacheChunkRequests,
+								OnCacheChunksGetComplete&&		OnComplete) override final
 	{
 		ZEN_TRACE_CPU("Upstream::GetCacheChunks");
 
@@ -1767,9 +1767,9 @@ public:
 		return {};
 	}
 
-	virtual void GetCacheValues(std::string_view			  Namespace,
-								std::span<CacheValueRequest*> CacheValueRequests,
-								OnCacheValueGetComplete&&	  OnComplete) override final
+	virtual void GetCacheValues(std::string_view				Namespace,
+								eastl::span<CacheValueRequest*> CacheValueRequests,
+								OnCacheValueGetComplete&&		OnComplete) override final
 	{
 		ZEN_TRACE_CPU("Upstream::GetCacheValues");
 
@@ -1945,7 +1945,7 @@ private:
 			PutUpstreamCacheResult Result;
 			{
 				metrics::OperationTiming::Scope Scope(Stats.CachePutRequestTiming);
-				Result = Endpoint->PutCacheRecord(CacheRecord, CacheValue.Value, std::span(Payloads));
+				Result = Endpoint->PutCacheRecord(CacheRecord, CacheValue.Value, eastl::span(Payloads));
 			}
 
 			Stats.CachePutTotalBytes.Increment(Result.Bytes);