diff options
| author | Matt Peters <[email protected]> | 2022-01-10 10:57:59 -0700 |
|---|---|---|
| committer | Matt Peters <[email protected]> | 2022-01-10 10:57:59 -0700 |
| commit | 4a12683b27adb31bde9eb8f7df3b9e9cc8ec680a (patch) | |
| tree | c8b2939d400dd4bccae73d2782b15c65d30db19d /zen | |
| parent | Add WaitForQuiescence RPC (diff) | |
| parent | Two missing override keywords (diff) | |
| download | archived-zen-wait_for_quiescence.tar.xz archived-zen-wait_for_quiescence.zip | |
Merge branch 'main' into wait_for_quiescencewait_for_quiescence
Diffstat (limited to 'zen')
| -rw-r--r-- | zen/cmds/cache.cpp | 4 | ||||
| -rw-r--r-- | zen/internalfile.cpp | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/zen/cmds/cache.cpp b/zen/cmds/cache.cpp index 2a911c8c7..f1b953af5 100644 --- a/zen/cmds/cache.cpp +++ b/zen/cmds/cache.cpp @@ -13,8 +13,6 @@ ZEN_THIRD_PARTY_INCLUDES_START #include <cpr/cpr.h> ZEN_THIRD_PARTY_INCLUDES_END -using namespace fmt::literals; - DropCommand::DropCommand() { m_Options.add_options()("h,help", "Print help"); @@ -35,7 +33,7 @@ DropCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) ZEN_INFO("Dropping cache bucket '{}' from '{}'", m_BucketName, m_HostName); cpr::Session Session; - Session.SetUrl({"{}/z$/{}"_format(m_HostName, m_BucketName)}); + Session.SetUrl({fmt::format("{}/z$/{}", m_HostName, m_BucketName)}); cpr::Response Result = Session.Delete(); if (zen::IsHttpSuccessCode(Result.status_code)) diff --git a/zen/internalfile.cpp b/zen/internalfile.cpp index a1f07992b..dbafcb549 100644 --- a/zen/internalfile.cpp +++ b/zen/internalfile.cpp @@ -192,8 +192,7 @@ InternalFile::OpenWrite(std::filesystem::path FileName, bool IsCreate) if (Success) { - using namespace fmt::literals; - zen::ThrowLastError("Failed to open file for writing: '{}'"_format(FileName)); + zen::ThrowLastError(fmt::format("Failed to open file for writing: '{}'", FileName)); } } @@ -218,8 +217,7 @@ InternalFile::OpenRead(std::filesystem::path FileName) if (Success) { - using namespace fmt::literals; - zen::ThrowLastError("Failed to open file for reading: '{}'"_format(FileName)); + zen::ThrowLastError(fmt::format("Failed to open file for reading: '{}'", FileName)); } } @@ -267,8 +265,7 @@ InternalFile::Read(void* Data, uint64_t Size, uint64_t Offset) if (Success) { - using namespace fmt::literals; - zen::ThrowLastError("Failed to read from file '{}'"_format("")); // zen::PathFromHandle(m_File))); + zen::ThrowLastError(fmt::format("Failed to read from file '{}'", "")); // zen::PathFromHandle(m_File))); } } @@ -293,7 +290,6 @@ InternalFile::Write(const void* Data, uint64_t Size, uint64_t Offset) if (Success) { - using namespace fmt::literals; - zen::ThrowLastError("Failed to write to file '{}'"_format(zen::PathFromHandle(m_File))); + zen::ThrowLastError(fmt::format("Failed to write to file '{}'", zen::PathFromHandle(m_File))); } } |