Merged main.

1 files changed, 17 insertions, 27 deletions

diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 1d43d372b..ef312d800 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -152,19 +152,16 @@ HttpStructuredCacheService::HandleRequest(HttpServerRequest& Request)
 void
 HttpStructuredCacheService::HandleCacheBucketRequest(HttpServerRequest& Request, std::string_view Bucket)
 {
-	ZEN_UNUSED(Request, Bucket);
 	switch (Request.RequestVerb())
 	{
-		using enum HttpVerb;
-
-		case kHead:
-		case kGet:
+		case HttpVerb::kHead:
+		case HttpVerb::kGet:
 			{
 				// Query stats
 			}
 			break;
 
-		case kDelete:
+		case HttpVerb::kDelete:
 			// Drop bucket
 
 			if (m_CacheStore.DropBucket(Bucket))
@@ -187,16 +184,14 @@ HttpStructuredCacheService::HandleCacheRecordRequest(HttpServerRequest& Request,
 {
 	switch (Request.RequestVerb())
 	{
-		using enum HttpVerb;
-
-		case kHead:
-		case kGet:
+		case HttpVerb::kHead:
+		case HttpVerb::kGet:
 			{
 				HandleGetCacheRecord(Request, Ref, Policy);
 			}
 			break;
 
-		case kPut:
+		case HttpVerb::kPut:
 			HandlePutCacheRecord(Request, Ref, Policy);
 			break;
 		default:
@@ -228,7 +223,7 @@ HttpStructuredCacheService::HandleGetCacheRecord(zen::HttpServerRequest& Request
 
 			if (!SkipAttachments)
 			{
-				CacheRecord.IterateAttachments([this, &Ref, &Package, &AttachmentCount, &ValidCount](CbFieldView AttachmentHash) {
+				CacheRecord.IterateAttachments([this, &Package, &AttachmentCount, &ValidCount](CbFieldView AttachmentHash) {
 					if (IoBuffer Chunk = m_CidStore.FindChunkByCid(AttachmentHash.AsHash()))
 					{
 						Package.AddAttachment(CbAttachment(CompressedBuffer::FromCompressed(SharedBuffer(Chunk))));
@@ -588,15 +583,13 @@ HttpStructuredCacheService::HandleCachePayloadRequest(HttpServerRequest& Request
 {
 	switch (Request.RequestVerb())
 	{
-		using enum HttpVerb;
-
-		case kHead:
-		case kGet:
+		case HttpVerb::kHead:
+		case HttpVerb::kGet:
 			{
 				HandleGetCachePayload(Request, Ref, Policy);
 			}
 			break;
-		case kPut:
+		case HttpVerb::kPut:
 			HandlePutCachePayload(Request, Ref, Policy);
 			break;
 		default:
@@ -772,9 +765,7 @@ HttpStructuredCacheService::HandleRpcRequest(zen::HttpServerRequest& Request)
 {
 	switch (Request.RequestVerb())
 	{
-		using enum HttpVerb;
-
-		case kPost:
+		case HttpVerb::kPost:
 			{
 				const HttpContentType ContentType = Request.RequestContentType();
 				const HttpContentType AcceptType  = Request.AcceptContentType();
@@ -813,8 +804,6 @@ HttpStructuredCacheService::HandleRpcGetCacheRecords(zen::HttpServerRequest& Req
 {
 	ZEN_TRACE_CPU("Z$::RpcGetCacheRecords");
 
-	using namespace fmt::literals;
-
 	CbPackage			  RpcResponse;
 	CacheRecordPolicy	  Policy;
 	CbObjectView		  Params = RpcRequest["Params"sv].AsObjectView();
@@ -902,7 +891,7 @@ HttpStructuredCacheService::HandleRpcGetCacheRecords(zen::HttpServerRequest& Req
 	if (!UpstreamRequests.empty() && m_UpstreamCache)
 	{
 		const auto OnCacheRecordGetComplete =
-			[this, &CacheKeys, &CacheValues, &RpcResponse, PartialOnError, SkipAttachments](CacheRecordGetCompleteParams&& Params) {
+			[this, &CacheValues, &RpcResponse, PartialOnError, SkipAttachments](CacheRecordGetCompleteParams&& Params) {
 				ZEN_ASSERT(Params.KeyIndex < CacheValues.size());
 
 				IoBuffer		CacheValue;
@@ -1011,8 +1000,6 @@ HttpStructuredCacheService::HandleRpcGetCachePayloads(zen::HttpServerRequest& Re
 {
 	ZEN_TRACE_CPU("Z$::RpcGetCachePayloads");
 
-	using namespace fmt::literals;
-
 	ZEN_ASSERT(RpcRequest["Method"sv].AsString() == "GetCachePayloads"sv);
 
 	std::vector<CacheChunkRequest> ChunkRequests;
@@ -1031,7 +1018,10 @@ HttpStructuredCacheService::HandleRpcGetCachePayloads(zen::HttpServerRequest& Re
 		const uint64_t RawSize		 = RequestObject["RawSize"sv].AsUInt64();
 		const uint32_t ChunkPolicy	 = RequestObject["Policy"sv].AsUInt32();
 
-		ChunkRequests.emplace_back(Key, ChunkId, PayloadId, RawOffset, RawSize, static_cast<CachePolicy>(ChunkPolicy));
+		// Note we could use emplace_back here but [Apple] LLVM-12's C++ library
+		// can't infer a constructor like other platforms (or can't handle an
+		// initializer list like others do).
+		ChunkRequests.push_back({Key, ChunkId, PayloadId, RawOffset, RawSize, static_cast<CachePolicy>(ChunkPolicy)});
 	}
 
 	if (ChunkRequests.empty())
@@ -1149,7 +1139,7 @@ HttpStructuredCacheService::HandleRpcGetCachePayloads(zen::HttpServerRequest& Re
 
 	if (!UpstreamRequests.empty() && m_UpstreamCache)
 	{
-		const auto OnCachePayloadGetComplete = [this, &ChunkRequests, &Chunks](CachePayloadGetCompleteParams&& Params) {
+		const auto OnCachePayloadGetComplete = [this, &Chunks](CachePayloadGetCompleteParams&& Params) {
 			if (CompressedBuffer Compressed = CompressedBuffer::FromCompressed(SharedBuffer(Params.Payload)))
 			{
 				m_CidStore.AddChunk(Compressed);