From 553a39b0c9e0a2f78fcfb093779b42301c107edb Mon Sep 17 00:00:00 2001
From: Martin Ridgers <martin.ridgers@epicgames.com>
Date: Fri, 11 Feb 2022 10:37:38 +0100
Subject: Fixed "Record* Record;" non-conformant compile errors from GCC

---
 zenserver/cache/structuredcache.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'zenserver/cache/structuredcache.cpp')

diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 037092eb6..25077d92a 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -1545,7 +1545,7 @@ namespace cache::detail {
 		IoHash	 ContentId;
 		uint64_t RawSize;
 	};
-	struct Record
+	struct RecordBody
 	{
 		IoBuffer				 CacheValue;
 		std::vector<RecordValue> Values;
@@ -1558,7 +1558,7 @@ namespace cache::detail {
 	struct ChunkRequest
 	{
 		CacheChunkRequest* Key	  = nullptr;
-		Record*			   Record = nullptr;
+		RecordBody*		   Record = nullptr;
 		CompressedBuffer   Value;
 		std::string_view   Source;
 		uint64_t		   TotalSize	   = 0;
@@ -1580,7 +1580,7 @@ HttpStructuredCacheService::HandleRpcGetCacheChunks(zen::HttpServerRequest& Http
 	ZEN_TRACE_CPU("Z$::RpcGetCacheChunks");
 
 	std::vector<CacheKeyRequest>	RecordKeys;		 // Data about a Record necessary to identify it to the upstream
-	std::vector<Record>				Records;		 // Scratch-space data about a Record when fulfilling RecordRequests
+	std::vector<RecordBody>			Records;		 // Scratch-space data about a Record when fulfilling RecordRequests
 	std::vector<CacheChunkRequest>	RequestKeys;	 // Data about a ChunkRequest necessary to identify it to the upstream
 	std::vector<ChunkRequest>		Requests;		 // Intermediate and result data about a ChunkRequest
 	std::vector<ChunkRequest*>		RecordRequests;	 // The ChunkRequests that are requesting a subvalue from a Record Key
@@ -1609,7 +1609,7 @@ HttpStructuredCacheService::HandleRpcGetCacheChunks(zen::HttpServerRequest& Http
 
 bool
 HttpStructuredCacheService::ParseGetCacheChunksRequest(std::vector<CacheKeyRequest>&			  RecordKeys,
-													   std::vector<cache::detail::Record>&		  Records,
+													   std::vector<cache::detail::RecordBody>&	  Records,
 													   std::vector<CacheChunkRequest>&			  RequestKeys,
 													   std::vector<cache::detail::ChunkRequest>&  Requests,
 													   std::vector<cache::detail::ChunkRequest*>& RecordRequests,
@@ -1636,7 +1636,7 @@ HttpStructuredCacheService::ParseGetCacheChunksRequest(std::vector<CacheKeyReque
 	ValueRequests.reserve(NumRequests);
 
 	CacheKeyRequest* PreviousRecordKey = nullptr;
-	Record*			 PreviousRecord	   = nullptr;
+	RecordBody*		 PreviousRecord	   = nullptr;
 
 	for (CbFieldView RequestView : ChunkRequestsArray)
 	{
@@ -1672,7 +1672,7 @@ HttpStructuredCacheService::ParseGetCacheChunksRequest(std::vector<CacheKeyReque
 		{
 			RecordRequests.push_back(&Request);
 			CacheKeyRequest* RecordKey = nullptr;
-			Record*			 Record	   = nullptr;
+			RecordBody*		 Record	   = nullptr;
 
 			if (!PreviousRecordKey || PreviousRecordKey->Key < RequestKey.Key)
 			{
@@ -1714,7 +1714,7 @@ HttpStructuredCacheService::ParseGetCacheChunksRequest(std::vector<CacheKeyReque
 
 void
 HttpStructuredCacheService::GetLocalCacheRecords(std::vector<CacheKeyRequest>&				RecordKeys,
-												 std::vector<cache::detail::Record>&		Records,
+												 std::vector<cache::detail::RecordBody>&	Records,
 												 std::vector<cache::detail::ChunkRequest*>& RecordRequests,
 												 std::vector<CacheChunkRequest*>&			OutUpstreamChunks)
 {
@@ -1724,7 +1724,7 @@ HttpStructuredCacheService::GetLocalCacheRecords(std::vector<CacheKeyRequest>&
 	for (size_t RecordIndex = 0; RecordIndex < Records.size(); ++RecordIndex)
 	{
 		CacheKeyRequest& RecordKey = RecordKeys[RecordIndex];
-		Record&			 Record	   = Records[RecordIndex];
+		RecordBody&		 Record	   = Records[RecordIndex];
 		if (Record.HasRequest)
 		{
 			Record.DownstreamPolicy |= CachePolicy::SkipData | CachePolicy::SkipMeta;
@@ -1756,7 +1756,7 @@ HttpStructuredCacheService::GetLocalCacheRecords(std::vector<CacheKeyRequest>&
 			}
 			CacheKeyRequest& RecordKey	 = Params.Request;
 			size_t			 RecordIndex = std::distance(RecordKeys.data(), &RecordKey);
-			Record&			 Record		 = Records[RecordIndex];
+			RecordBody&		 Record		 = Records[RecordIndex];
 
 			const CacheKey& Key	  = RecordKey.Key;
 			Record.Exists		  = true;
@@ -1780,7 +1780,7 @@ HttpStructuredCacheService::GetLocalCacheRecords(std::vector<CacheKeyRequest>&
 		{
 			// Unreal uses a 12 byte ID to address cache record values. When the uncompressed hash (ChunkId)
 			// is missing, parse the cache record and try to find the raw hash from the ValueId.
-			Record& Record = *Request->Record;
+			RecordBody& Record = *Request->Record;
 			if (!Record.ValuesRead)
 			{
 				Record.ValuesRead = true;
-- 
cgit v1.2.3