diff options
| author | Martin Ridgers <[email protected]> | 2022-01-10 12:07:03 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2022-01-10 13:22:28 +0100 |
| commit | 9086231f3923c0df6d9ef817441bfae5e134e8ff (patch) | |
| tree | 739a41ca51910d9319cb6c04af435bf9b4c6d5cd /zenserver/upstream/upstreamcache.cpp | |
| parent | Vcpkg's manifest mode is no longer in use (diff) | |
| download | zen-9086231f3923c0df6d9ef817441bfae5e134e8ff.tar.xz zen-9086231f3923c0df6d9ef817441bfae5e134e8ff.zip | |
Converted use of _format UDL to fmt::format
Diffstat (limited to 'zenserver/upstream/upstreamcache.cpp')
| -rw-r--r-- | zenserver/upstream/upstreamcache.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp index 38179f490..eb9d4fa95 100644 --- a/zenserver/upstream/upstreamcache.cpp +++ b/zenserver/upstream/upstreamcache.cpp @@ -270,8 +270,6 @@ namespace detail { { ZEN_TRACE_CPU("Upstream::Horde::PutCacheRecord"); - using namespace fmt::literals; - ZEN_ASSERT(CacheRecord.PayloadIds.size() == Payloads.size()); const int32_t MaxAttempts = 3; @@ -313,7 +311,7 @@ namespace detail { if (It == std::end(CacheRecord.PayloadIds)) { - OutReason = "payload '{}' MISSING from local cache"_format(PayloadId); + OutReason = fmt::format("payload '{}' MISSING from local cache", PayloadId); return false; } @@ -329,7 +327,7 @@ namespace detail { if (!BlobResult.Success) { - OutReason = "upload payload '{}' FAILED, reason '{}'"_format(PayloadId, BlobResult.Reason); + OutReason = fmt::format("upload payload '{}' FAILED, reason '{}'", PayloadId, BlobResult.Reason); return false; } @@ -350,7 +348,7 @@ namespace detail { if (!RefResult.Success) { - return {.Reason = "upload cache record '{}/{}' FAILED, reason '{}'"_format(CacheRecord.Key.Bucket, + return {.Reason = fmt::format("upload cache record '{}/{}' FAILED, reason '{}'", CacheRecord.Key.Bucket, CacheRecord.Key.Hash, RefResult.Reason), .Success = false}; @@ -371,7 +369,7 @@ namespace detail { if (!FinalizeResult.Success) { - return {.Reason = "finalize cache record '{}/{}' FAILED, reason '{}'"_format(CacheRecord.Key.Bucket, + return {.Reason = fmt::format("finalize cache record '{}/{}' FAILED, reason '{}'", CacheRecord.Key.Bucket, CacheRecord.Key.Hash, FinalizeResult.Reason), .Success = false}; @@ -389,7 +387,7 @@ namespace detail { if (!FinalizeResult.Success) { - return {.Reason = "finalize '{}/{}' FAILED, reason '{}'"_format(CacheRecord.Key.Bucket, + return {.Reason = fmt::format("finalize '{}/{}' FAILED, reason '{}'", CacheRecord.Key.Bucket, CacheRecord.Key.Hash, FinalizeResult.Reason), .Success = false}; @@ -403,7 +401,7 @@ namespace detail { Sb << MissingHash.ToHexString() << ","; } - return {.Reason = "finalize '{}/{}' FAILED, still needs payload(s) '{}'"_format(CacheRecord.Key.Bucket, + return {.Reason = fmt::format("finalize '{}/{}' FAILED, still needs payload(s) '{}'", CacheRecord.Key.Bucket, CacheRecord.Key.Hash, Sb.ToString()), .Success = false}; @@ -480,8 +478,6 @@ namespace detail { virtual UpstreamEndpointHealth Initialize() override { - using namespace fmt::literals; - const ZenEndpoint& Ep = GetEndpoint(); if (Ep.Ok) { @@ -500,8 +496,6 @@ namespace detail { virtual UpstreamEndpointHealth CheckHealth() override { - using namespace fmt::literals; - try { if (m_Client.IsNull()) |