diff options
Diffstat (limited to 'zenserver/upstream/upstreamapply.cpp')
| -rw-r--r-- | zenserver/upstream/upstreamapply.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/zenserver/upstream/upstreamapply.cpp b/zenserver/upstream/upstreamapply.cpp index f8a8c3e62..fe7f7d9c8 100644 --- a/zenserver/upstream/upstreamapply.cpp +++ b/zenserver/upstream/upstreamapply.cpp @@ -53,10 +53,9 @@ namespace detail { , m_CasStore(CasStore) , m_CidStore(CidStore) { - using namespace fmt::literals; - m_DisplayName = "Horde - '{}'"_format(Options.ServiceUrl); + m_DisplayName = fmt::format("Horde - '{}'", Options.ServiceUrl); m_Client = new CloudCacheClient(Options); - m_ChannelId = "zen-{}"_format(zen::GetSessionIdString()); + m_ChannelId = fmt::format("zen-{}", zen::GetSessionIdString()); } virtual ~HordeUpstreamApplyEndpoint() = default; @@ -442,14 +441,13 @@ namespace detail { if (Outcome != ComputeTaskOutcome::Success) { - using namespace fmt::literals; const std::string_view Detail = TaskStatus["d"sv].AsString(); if (!Detail.empty()) { return {.Error{.ErrorCode = -1, - .Reason = "Task {}: {}"_format(ComputeTaskOutcomeToString(Outcome), std::string(Detail))}}; + .Reason = fmt::format("Task {}: {}", ComputeTaskOutcomeToString(Outcome), std::string(Detail))}}; } - return {.Error{.ErrorCode = -1, .Reason = "Task {}"_format(ComputeTaskOutcomeToString(Outcome))}}; + return {.Error{.ErrorCode = -1, .Reason = fmt::format("Task {}", ComputeTaskOutcomeToString(Outcome))}}; } const IoHash TaskId = TaskStatus["h"sv].AsObjectAttachment(); @@ -713,8 +711,6 @@ namespace detail { [[nodiscard]] bool ProcessApplyKey(const UpstreamApplyRecord& ApplyRecord, UpstreamData& Data) { - using namespace fmt::literals; - std::string ExecutablePath; std::map<std::string, std::string> Environment; std::set<std::filesystem::path> InputFiles; @@ -749,7 +745,7 @@ namespace detail { for (auto& It : ApplyRecord.WorkerDescriptor["dirs"sv]) { std::string_view Directory = It.AsString(); - std::string DummyFile = "{}/.zen_empty_file"_format(Directory); + std::string DummyFile = fmt::format("{}/.zen_empty_file", Directory); InputFiles.insert(DummyFile); Data.Blobs[EmptyBufferId] = EmptyBuffer; InputFileHashes[DummyFile] = EmptyBufferId; @@ -816,7 +812,6 @@ namespace detail { Data.Objects[SandboxHash] = std::move(Sandbox); { - using namespace fmt::literals; std::string_view HostPlatform = ApplyRecord.WorkerDescriptor["host"sv].AsString(); if (HostPlatform.empty()) { @@ -829,7 +824,7 @@ namespace detail { bool Exclusive = ApplyRecord.WorkerDescriptor["exclusive"sv].AsBool(); // TODO: Remove override when Horde accepts the UE style Host Platforms (Win64, Linux, Mac) - std::string Condition = "Platform == '{}'"_format(HostPlatform); + std::string Condition = fmt::format("Platform == '{}'", HostPlatform); if (HostPlatform == "Win64") { Condition += " && Pool == 'Win-RemoteExec'"; |